Merge pull request #7511 from turbo124/v5-stable

v5.3.95

VERSION.txt

@@ -1 +1 @@
-5.3.94
+5.3.95

app/Export/CSV/QuoteItemExport.php

@@ -78,7 +78,7 @@ class QuoteItemExport extends BaseExport
         'tax_name2' => 'item.tax_name2',
         'tax_name3' => 'item.tax_name3',
         'line_total' => 'item.line_total',
-        'gross_line_total' => 'item.gross_line_total',
+        // 'gross_line_total' => 'item.gross_line_total',
         'custom_value1' => 'item.custom_value1',
         'custom_value2' => 'item.custom_value2',
         'custom_value3' => 'item.custom_value3',

app/Http/Controllers/SelfUpdateController.php

@@ -135,30 +135,30 @@ class SelfUpdateController extends BaseController
 
         nlog("Extracting zip");
 
-        try{
+        // try{
-            $s = new Snappdf;
+        //     $s = new Snappdf;
-            $s->getChromiumPath();
+        //     $s->getChromiumPath();
-            chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
+        //     chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
-        }
+        // }
-        catch(\Exception $e){
+        // catch(\Exception $e){
-            nlog("I could not set the file permissions for chrome");
+        //     nlog("I could not set the file permissions for chrome");
-        }
+        // }
 
-        // $zipFile = new \PhpZip\ZipFile();
+        $zipFile = new \PhpZip\ZipFile();
 
-        // $zipFile->openFile($file);
+        $zipFile->openFile($file);
 
-        // $zipFile->extractTo(base_path());
+        $zipFile->extractTo(base_path());
 
-        // $zipFile->close();
+        $zipFile->close();
 
-        $zip = new \ZipArchive;
+        // $zip = new \ZipArchive;
         
-        $res = $zip->open($file);
+        // $res = $zip->open($file);
-        if ($res === TRUE) {
+        // if ($res === TRUE) {
-            $zip->extractTo(base_path());
+        //     $zip->extractTo(base_path());
-            $zip->close();
+        //     $zip->close();
-        } 
+        // } 
 
         nlog("Finished extracting files");
 

app/Models/Client.php

@@ -667,8 +667,6 @@ class Client extends BaseModel implements HasLocalePreference
         $offset -= $timezone->utc_offset;
         $offset += ($entity_send_time * 3600);
         
-        nlog("offset = {$offset}");
-        
         return $offset;
     }
 

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.3.94',
+    'app_version' => '5.3.95',
-    'app_tag' => '5.3.94',
+    'app_tag' => '5.3.95',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

public/flutter_service_worker.js

@@ -3,43 +3,43 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
-  "main.dart.js": "dc33896edc7d40c104d85ca2d6c83176",
+  "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
+"icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
+"/": "90082634bee3634faebfddf446a803a2",
+"main.dart.js": "cf8b4f4a686adceb3f1085f27a463220",
+"version.json": "3afb81924daf4f751571755436069115",
+"favicon.png": "dca91c54388f52eded692718d5a98b8b",
+"flutter.js": "0816e65a103ba8ba51b174eeeeb2cb67",
+"favicon.ico": "51636d3a390451561744c42188ccd628",
 "canvaskit/canvaskit.wasm": "4b83d89d9fecbea8ca46f2f760c5a9ba",
 "canvaskit/profiling/canvaskit.wasm": "95e736ab31147d1b2c7b25f11d4c32cd",
 "canvaskit/profiling/canvaskit.js": "ae2949af4efc61d28a4a80fffa1db900",
 "canvaskit/canvaskit.js": "c2b4e5f3d7a3d82aed024e7249a78487",
-"flutter.js": "0816e65a103ba8ba51b174eeeeb2cb67",
+"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
-"/": "e6fea64a985bef161e4db9ad8e7fee99",
-"favicon.png": "dca91c54388f52eded692718d5a98b8b",
-"version.json": "3afb81924daf4f751571755436069115",
 "assets/AssetManifest.json": "38d9aea341601f3a5c6fa7b5a1216ea5",
 "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "b62641afc9ab487008e996a5c5865e56",
-"assets/assets/images/icon.png": "090f69e23311a4b6d851b3880ae52541",
+"assets/fonts/MaterialIcons-Regular.otf": "95db9098c58fd6db106f1116bae85a0b",
-"assets/assets/images/payment_types/ach.png": "7433f0aff779dc98a649b7a2daf777cf",
+"assets/assets/images/logo_light.png": "e5f46d5a78e226e7a9553d4ca6f69219",
-"assets/assets/images/payment_types/jcb.png": "07e0942d16c5592118b72e74f2f7198c",
 "assets/assets/images/payment_types/discover.png": "6c0a386a00307f87db7bea366cca35f5",
 "assets/assets/images/payment_types/carteblanche.png": "d936e11fa3884b8c9f1bd5c914be8629",
-"assets/assets/images/payment_types/switch.png": "4fa11c45327f5fdc20205821b2cfd9cc",
-"assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
-"assets/assets/images/payment_types/solo.png": "2030c3ccaccf5d5e87916a62f5b084d6",
-"assets/assets/images/payment_types/mastercard.png": "6f6cdc29ee2e22e06b1ac029cb52ef71",
-"assets/assets/images/payment_types/unionpay.png": "7002f52004e0ab8cc0b7450b0208ccb2",
-"assets/assets/images/payment_types/visa.png": "3ddc4a4d25c946e8ad7e6998f30fd4e3",
-"assets/assets/images/payment_types/amex.png": "c49a4247984b3732a4af50a3390aa978",
-"assets/assets/images/payment_types/laser.png": "b4e6e93dd35517ac429301119ff05868",
-"assets/assets/images/payment_types/paypal.png": "8e06c094c1871376dfea1da8088c29d1",
 "assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
+"assets/assets/images/payment_types/laser.png": "b4e6e93dd35517ac429301119ff05868",
+"assets/assets/images/payment_types/ach.png": "7433f0aff779dc98a649b7a2daf777cf",
+"assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
+"assets/assets/images/payment_types/unionpay.png": "7002f52004e0ab8cc0b7450b0208ccb2",
 "assets/assets/images/payment_types/maestro.png": "e533b92bfb50339fdbfa79e3dfe81f08",
+"assets/assets/images/payment_types/paypal.png": "8e06c094c1871376dfea1da8088c29d1",
+"assets/assets/images/payment_types/visa.png": "3ddc4a4d25c946e8ad7e6998f30fd4e3",
+"assets/assets/images/payment_types/solo.png": "2030c3ccaccf5d5e87916a62f5b084d6",
+"assets/assets/images/payment_types/amex.png": "c49a4247984b3732a4af50a3390aa978",
+"assets/assets/images/payment_types/switch.png": "4fa11c45327f5fdc20205821b2cfd9cc",
+"assets/assets/images/payment_types/jcb.png": "07e0942d16c5592118b72e74f2f7198c",
+"assets/assets/images/payment_types/mastercard.png": "6f6cdc29ee2e22e06b1ac029cb52ef71",
+"assets/assets/images/icon.png": "090f69e23311a4b6d851b3880ae52541",
 "assets/assets/images/google_logo.png": "0f118259ce403274f407f5e982e681c3",
-"assets/assets/images/logo_light.png": "e5f46d5a78e226e7a9553d4ca6f69219",
 "assets/assets/images/logo_dark.png": "a233ed1d4d0f7414bf97a9a10f11fb0a",
 "assets/NOTICES": "52d7174bb068ef86545951d5bc8c5744",
-"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
+"manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40"
-"assets/fonts/MaterialIcons-Regular.otf": "95db9098c58fd6db106f1116bae85a0b",
-"manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
-"icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
-"icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
-"favicon.ico": "51636d3a390451561744c42188ccd628"
 };
 
 // The application shell files that are downloaded before a service worker can

resources/views/email/template/admin.blade.php

@@ -117,13 +117,20 @@
                     </div>
                 </tr>
                 <tr>
-                    <td>
+                    <td align="center">
                         <div class="dark-bg"
                              style="background-color:#f9f9f9; border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 20px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
-                            <img class="logo-light"
+    
-                                 style="margin-top: 20px; max-width: 155px; display: block; margin-left: auto; margin-right: auto; "
+                            <!--[if gte mso 9]>
-                                 src="{{ $logo ?? '' }}"
+                            <img src="{{ $logo ?? '' }}" alt="" width="155" border="0" align="middle" style="display:block;" />
-                                 width="155" />
+                            <div style="mso-hide:all;">
+                            <![endif]-->
+                            <img class="logo-light" src="{{ $logo ?? '' }}" alt="" style="margin-top: 20px;  max-width: 155px; display: block; margin-left: auto; margin-right: auto;"/>
+                            <!--[if gte mso 9]>
+                            </div>
+                            <![endif]-->
+
+
                         </div>
                     </td>
                 </tr>

resources/views/email/template/client.blade.php

@@ -94,19 +94,24 @@
                     <div style="text-align: center;margin-top: 25px; margin-bottom: 10px;"></div>
                 </tr>
                 <tr>
-                    <td>
+                    <td align="center" cellpadding="20">
                         <div
                             style="border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 10px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
 
-                            <img
+                            <!--[if gte mso 9]>
-                                style="margin-top: 40px; height: 40px; display: block; margin-left: auto; margin-right: auto;"
+                            <img src="{{ $logo ?? '' }}" alt="" width="400" border="0" align="middle" style="display:block;" />
-                                alt=""
+                            <div style="mso-hide:all;">
-                                src="{{ $logo ?? '' }}"/>
+                            <![endif]-->
+                            <img src="{{ $logo ?? '' }}" alt="" style="margin-top: 40px; display: block; margin-left: auto; margin-right: auto;"/>
+                            <!--[if gte mso 9]>
+                            </div>
+                            <![endif]-->
+
                         </div>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td cellpadding="20">
                         <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content">
                                 <div style="padding-top: 10px;"></div>
 
@@ -123,7 +128,13 @@
                 </tr>  
                 
                 <tr>
-                    <td>
+                  <td height="20">
+                   <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content"> </div>
+                 </td>
+                </tr>
+
+                <tr>
+                    <td cellpadding="20" bgcolor="#f9f9f9">
                         <div class="dark-bg dark-text-white"
                              style="text-align: center; padding-top: 10px; padding-bottom: 25px; background-color: #f9f9f9; border: 1px solid #c2c2c2; border-top: none; border-bottom-color: #f9f9f9;">
                             @isset($signature)
@@ -145,7 +156,7 @@
                 </tr>
 
                 <tr>
-                    <td>
+                    <td bgcolor="#242424"  cellpadding="20">
                         <div class="dark-bg-base"
                              style="padding-top: 10px;padding-bottom: 10px; background-color: #242424; border: 1px solid #c2c2c2; border-top-color: #242424; border-bottom-color: #242424;">
                             @if(isset($company))