Merge pull request #7608 from turbo124/v5-stable

v5.4.7

VERSION.txt

@@ -1 +1 @@
-5.4.6
+5.4.7

app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php

@@ -18,7 +18,7 @@ class ShowRecurringInvoiceRequest extends Request
 {
     public function authorize() : bool
     {
-        return auth()->guard('contact')->user()->client->id === $this->recurring_invoice->client_id
+        return auth()->guard('contact')->user()->client->id == $this->recurring_invoice->client_id
             && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
     }
 

app/Jobs/Mail/NinjaMailerJob.php

@@ -334,8 +334,8 @@ class NinjaMailerJob implements ShouldQueue
             return true;
      
         /* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */
-        // if(Ninja::isHosted())
+        if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class))
-        //     return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
+            return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
 
         return false;
     }

app/Jobs/Util/Import.php

@@ -923,6 +923,9 @@ class Import implements ShouldQueue
             $modified['company_id'] = $this->company->id;
             $modified['line_items'] = $this->cleanItems($modified['line_items']);
 
+            if(array_key_exists('next_send_date', $resource))
+                $modified['next_send_date_client'] = $resource['next_send_date'];
+
             if(array_key_exists('created_at', $modified))
                 $modified['created_at'] = Carbon::parse($modified['created_at']);
 

app/Services/PdfMaker/Design.php

@@ -332,7 +332,10 @@ class Design extends BaseDesign
             $_variable = explode('.', $variable)[1];
             $_customs = ['custom1', 'custom2', 'custom3', 'custom4'];
 
-            if (in_array($_variable, $_customs)) {
+            /* 2/7/2022 don't show custom values if they are empty */
+            $var = str_replace("custom", "custom_value", $_variable);
+
+            if (in_array($_variable, $_customs) && !empty($this->entity->{$var})) {
                 $elements[] = ['element' => 'tr', 'elements' => [
                     ['element' => 'th', 'content' => $variable . '_label', 'properties' => ['data-ref' => 'entity_details-' . substr($variable, 1) . '_label']],
                     ['element' => 'th', 'content' => $variable, 'properties' => ['data-ref' => 'entity_details-' . substr($variable, 1)]],

app/Services/PurchaseOrder/ApplyNumber.php

@@ -41,7 +41,20 @@ class ApplyNumber extends AbstractService
             return $this->purchase_order;
         }
 
+        switch ($this->vendor->company->getSetting('counter_number_applied')) {
+            case 'when_saved':
                 $this->trySaving();
+                break;
+            case 'when_sent':
+                if ($this->invoice->status_id == PurchaseOrder::STATUS_SENT) {
+                    $this->trySaving();
+                }
+                break;
+
+            default:
+                break;
+        }
+
 
         return $this->purchase_order;
     }

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.4.6',
+    'app_version' => '5.4.7',
-    'app_tag' => '5.4.6',
+    'app_tag' => '5.4.7',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

public/flutter_service_worker.js

@@ -8,7 +8,7 @@ const RESOURCES = {
 "canvaskit/profiling/canvaskit.js": "ae2949af4efc61d28a4a80fffa1db900",
 "canvaskit/profiling/canvaskit.wasm": "95e736ab31147d1b2c7b25f11d4c32cd",
 "canvaskit/canvaskit.wasm": "4b83d89d9fecbea8ca46f2f760c5a9ba",
-"/": "46443d15dbe8e491c73190330d91d4e2",
+"/": "0ba127947d7857ad97e39c264e308461",
 "flutter.js": "0816e65a103ba8ba51b174eeeeb2cb67",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
@@ -39,7 +39,7 @@ const RESOURCES = {
 "assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
 "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "b62641afc9ab487008e996a5c5865e56",
 "assets/NOTICES": "9b6b63256d3a6491659b71127ee9f3b6",
-"main.dart.js": "0f10062693740735811a5a29bc063592"
+"main.dart.js": "739fb98bd5601a93da8be6b4358508d2"
 };
 
 // The application shell files that are downloaded before a service worker can

public/main.profile.dart.js

@@ -301981,12 +301981,11 @@
       return this.rebuild$1(new A.CompanyEntity_coreCompany_closure());
     },
     isModuleEnabled$1(entityType) {
-      var t1, store, _this = this;
+      var t1, _this = this;
       if (entityType === B.EntityType_purchaseOrder) {
         t1 = $.$get$navigatorKey();
         t1.toString;
-        store = A.StoreProvider_of($.WidgetsBinding__instance.WidgetsBinding__buildOwner._globalKeyRegistry.$index(0, t1), type$.legacy_AppState);
+        if (A.cleanApiUrl(A._lateReadCheck(A.StoreProvider_of($.WidgetsBinding__instance.WidgetsBinding__buildOwner._globalKeyRegistry.$index(0, t1), type$.legacy_AppState).__Store__state, "_state").authState.url) !== "https://staging.invoicing.co")
-        if (A._lateReadCheck(store.__Store__state, "_state").get$isHosted() && A.cleanApiUrl(A._lateReadCheck(store.__Store__state, "_state").authState.url) !== "https://staging.invoicing.co")
           return false;
       }
       if ((entityType === B.EntityType_invoice || entityType === B.EntityType_payment) && (_this.enabledModules & 4096) === 0)
@@ -343029,10 +343028,13 @@
       return (t1 == null ? 0 : t1) > 0;
     },
     get$createdAtLimit() {
-      var numberYearsActive,
+      var t2, numberYearsActive,
         t1 = this.uiState.selectedCompanyIndex;
       t1 = this.userCompanyStates._list[t1].userCompany;
-      numberYearsActive = t1.settings.numberYearsActive;
+      t2 = t1.settings;
+      numberYearsActive = t2 == null ? null : t2.numberYearsActive;
+      if (numberYearsActive == null)
+        numberYearsActive = 0;
       if (!t1.company.isLarge || numberYearsActive === 0)
         return 0;
       return B.JSNumber_methods.round$0(Date.now() / 1000) - numberYearsActive * 31536000;