Merge branch 'master'

crater-invoice-inc · Jan 25, 2020 · 8e50c36 · 8e50c36
2 parents b499741 + b409cdb
commit 8e50c36
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/app/Space/Updater.php b/app/Space/Updater.php
@@ -19,7 +19,13 @@ public static function update($installed, $version)
         $data = null;
         $path = null;
 
-        $url = 'https://craterapp.com/downloads/file/'.$version.'?type=update';
+        if(env('APP_ENV') === 'development')
+        {
+            $url = 'https://craterapp.com/downloads/file/'.$version.'?type=update&is_dev=1';
+        } else {
+            $url = 'https://craterapp.com/downloads/file/'.$version.'?type=update';
+        }
+
 
         $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
 
@@ -115,7 +121,12 @@ public static function finishUpdate($installed, $version)
     public static function checkForUpdate()
     {
         $data = null;
-        $url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version') . '?type=update';
+        if(env('APP_ENV') === 'development')
+        {
+            $url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version') . '?type=update&is_dev=1';
+        } else {
+            $url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version') . '?type=update';
+        }
 
         $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
 

diff --git a/resources/assets/js/views/invoices/Create.vue b/resources/assets/js/views/invoices/Create.vue
@@ -135,8 +135,17 @@
                 icon="hashtag"
                 @input="$v.invoiceNumAttribute.$touch()"
               />
-              <span v-show="$v.invoiceNumAttribute.$error && !$v.invoiceNumAttribute.required" class="text-danger mt-1"> {{ $tc('validation.required') }}  </span>
-              <span v-show="!$v.invoiceNumAttribute.numeric" class="text-danger mt-1"> {{ $tc('validation.numbers_only') }}  </span>
+              <span
+                v-show="$v.invoiceNumAttribute.$error && !$v.invoiceNumAttribute.required"
+                class="text-danger mt-1"
+              >
+                {{ $tc('validation.required') }}
+              </span>
+              <span
+                v-show="!$v.invoiceNumAttribute.numeric" class="text-danger mt-1"
+              >
+                {{ $tc('validation.numbers_only') }}
+              </span>
             </div>
             <div class="col collapse-input">
               <label>{{ $t('invoices.ref_number') }}</label>
@@ -146,7 +155,12 @@
                 icon="hashtag"
                 @input="$v.newInvoice.reference_number.$touch()"
               />
-              <div v-if="$v.newInvoice.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div>
+              <div
+                v-if="$v.newInvoice.reference_number.$error"
+                class="text-danger"
+              >
+                {{ $tc('validation.ref_number_maxlength') }}
+              </div>
             </div>
           </div>
         </div>