Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2022-07-04 14:41:28 +10:00
commit ae6ae410d3
5 changed files with 2563 additions and 2555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -399,7 +399,7 @@ class NinjaMailerJob implements ShouldQueue
return false;
}
return $user->oauth_user_refresh_token;
return $user->oauth_user_token;
}

4
public/flutter_service_worker.js vendored
View File

@ -8,7 +8,7 @@ const RESOURCES = {
"canvaskit/profiling/canvaskit.js": "ae2949af4efc61d28a4a80fffa1db900",
"canvaskit/profiling/canvaskit.wasm": "95e736ab31147d1b2c7b25f11d4c32cd",
"canvaskit/canvaskit.wasm": "4b83d89d9fecbea8ca46f2f760c5a9ba",
"/": "0ba127947d7857ad97e39c264e308461",
"/": "1e25684a324b2062ee8825dd04e65149",
"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": "739fb98bd5601a93da8be6b4358508d2"
"main.dart.js": "6127d3e15081d411a058f70b1c8492ef"
};
// The application shell files that are downloaded before a service worker can

5099
public/main.dart.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/main.dart.js.map
View File

File diff suppressed because one or more lines are too long

7
public/main.profile.dart.js vendored
View File

@ -397993,6 +397993,9 @@
case B.EntityType_credit:
_this.selectedTemplate = B.EmailTemplate_credit;
break;
case B.EntityType_purchaseOrder:
_this.selectedTemplate = B.EmailTemplate_purchase_order;
break;
}
},
didChangeDependencies$0() {
@ -398060,6 +398063,8 @@
t7 = A._setArrayType([A.DropdownMenuItem$(t2, _null, t7, t8)], t9);
if (t3 === B.EntityType_invoice)
B.JSArray_methods.addAll$1(t7, A._setArrayType([A.DropdownMenuItem$(A.Text$(t1.get$firstReminder(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, B.EmailTemplate_reminder1, t8), A.DropdownMenuItem$(A.Text$(t1.get$secondReminder(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, B.EmailTemplate_reminder2, t8), A.DropdownMenuItem$(A.Text$(t1.get$thirdReminder(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, B.EmailTemplate_reminder3, t8)], t9));
if (t3 === B.EntityType_purchaseOrder)
B.JSArray_methods.addAll$1(t7, A._setArrayType([A.DropdownMenuItem$(A.Text$(t1.get$purchaseOrder(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, B.EmailTemplate_purchase_order, t8)], t9));
t2 = settings.emailSubjectCustom1;
if ((t2 == null ? "" : t2).length !== 0)
t7.push(A.DropdownMenuItem$(A.Text$(t1.get$firstCustom(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, B.EmailTemplate_custom1, t8));
@ -418498,7 +418503,7 @@
A.showMessageDialog(context, t2.get$vendorEmailNotSet(), _null, A._setArrayType([A.TextButton$(false, A.Text$(t2.get$editVendor().toUpperCase(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, new A._InvoiceEditState__onSavePressed_closure(context, vendor), _null)], type$.JSArray_legacy_TextButton));
return;
}
} else {
} else if (!client.get$hasEmailAddress()) {
A.showMessageDialog(context, t2.get$clientEmailNotSet(), _null, A._setArrayType([A.TextButton$(false, A.Text$(t2.get$editClient().toUpperCase(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, new A._InvoiceEditState__onSavePressed_closure0(context, client), _null)], type$.JSArray_legacy_TextButton));
return;
}