Merge pull request #11707 from turbo124/v5-develop

v5.12.64

VERSION.txt

@@ -1 +1 @@
-5.12.63
+5.12.64

app/Services/EDocument/Gateway/Transformers/StorecoveExpense.php

@@ -267,6 +267,12 @@ class StorecoveExpense
             return $storecove_invoice->getDocumentCurrencyCode() == $c->code;
         })->id ?? 1;
 
+        $countries = app('countries');
+
+        $country_id = $countries->first(function ($c) use ($party) {
+            return $party->getAddress()->getCountry() == $c->iso_3166_2 || $party->getAddress()->getCountry() == $c->iso_3166_3;
+        })->id ?? 1;
+
         //vendor
         $vendor = [
             'name' => $party->getCompanyName() ?? $party->getRegistrationName(),
@@ -280,6 +286,7 @@ class StorecoveExpense
             'city' => $party->getAddress()->getCity() ?? '',
             'state' => $party->getAddress()->getCounty() ?? '',
             'postal_code' => $party->getAddress()->getZip() ?? '',
+            'country_id' => $country_id,
             'contacts' => [
                 [
                     'first_name' => $party->getContact()->getFirstName() ?? '',
@@ -312,9 +319,9 @@ class StorecoveExpense
             'vendor' => $vendor,
         ];
 
-        nlog($expense);
-
         return $expense;
 
     }
+
+
 }

config/ninja.php

@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.12.63'),
-    'app_tag' => env('APP_TAG', '5.12.63'),
+    'app_version' => env('APP_VERSION', '5.12.64'),
+    'app_tag' => env('APP_TAG', '5.12.64'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

public/build/assets/app-7631292d.js

@@ -93,4 +93,4 @@ focus-trap/dist/focus-trap.js:
   * focus-trap 6.9.4
   * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
   *)
-*/Da.start();window.axios=Jl;window.valid=Xu;document.querySelectorAll(".disposable-alert").forEach(e=>{setTimeout(()=>{e.remove()},5e3)});(async()=>{try{const e="/build/dist/builder.iife.js";await Ql(()=>import(e),[]),console.log("DocuNinja loaded")}catch{console.log("DocuNinja not available, skipping...")}})();
+*/Da.start();window.axios=Jl;window.valid=Xu;document.querySelectorAll(".disposable-alert").forEach(e=>{setTimeout(()=>{e.remove()},5e3)});(async()=>{try{const e="/build/assets/builder.iife.js";await Ql(()=>import(e),[]),console.log("DocuNinja loaded")}catch{console.log("DocuNinja not available, skipping...")}})();

public/build/manifest.json

@@ -12,7 +12,7 @@
     "file": "assets/wait-8f4ae121.js"
   },
   "resources/js/app.js": {
-    "file": "assets/app-ed86bab1.js",
+    "file": "assets/app-7631292d.js",
     "imports": [
       "_index-08e160a7.js",
       "__commonjsHelpers-725317a4.js"
@@ -390,7 +390,7 @@
     "src": "resources/js/setup/setup.js"
   },
   "resources/sass/app.scss": {
-    "file": "assets/app-00f88bed.css",
+    "file": "assets/app-89d2fe8e.css",
     "isEntry": true,
     "src": "resources/sass/app.scss"
   }

resources/js/app.js

@@ -30,7 +30,7 @@ document.querySelectorAll('.disposable-alert').forEach((element) => {
  */
 (async () => {
     try {
-        const modulePath = '/build/dist/builder.iife.js';
+        const modulePath = '/build/assets/builder.iife.js';
         await import(/* @vite-ignore */ modulePath);
         console.log('DocuNinja loaded');
     } catch (e) {

resources/views/portal/ninja2020/flow2/docu-ninja.blade.php

@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="{{ asset('build/dist/builder2.0.standalone.css') }}">
+<link rel="stylesheet" href="{{ asset('build/assets/builder2.0.standalone.css') }}">
 
 <div class="rounded-lg border bg-card text-card-foreground shadow-sm overflow-hidden px-4 py-5 bg-white sm:gap-4 sm:px-6">
     <div class="p-2">
@@ -22,7 +22,7 @@
 </div>
     
 @assets
-<script src="{{ asset('build/dist/builder.iife.js') }}"></script>
+<script src="{{ asset('build/assets/builder.iife.js') }}"></script>
 @endassets
 
 @script

vite.config.ts

@@ -64,11 +64,11 @@ export default defineConfig({
             targets: [
                 {
                     src: 'node_modules/@docuninja/builder2.0/dist/builder2.0.standalone.css',
-                    dest: 'dist',
+                    dest: 'assets',
                 },
                 {
                     src: 'node_modules/@docuninja/builder2.0/dist/builder.iife.js',
-                    dest: 'dist',
+                    dest: 'assets',
                 },
             ],
         }),