merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into datagrid-plus-changes

This commit is contained in:
Devansh 2022-04-05 11:33:39 +05:30
parent 483cc0d5d0 94e5df24d4
commit bf953fed22
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=68621909141b010f749f",
"/css/admin.css": "/css/admin.css?id=0597ed69210c620608a4"
"/js/admin.js": "/js/admin.js?id=1dddbb0d655216b79be5",
"/css/admin.css": "/css/admin.css?id=e2f2c3ed8cc1f33c8d60"
}

3
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -341,6 +341,9 @@ body {
font-weight: 200;
display: inline-block;
color: $black;
width: 115px;
word-break: break-all;
vertical-align: middle;
}
.arrow-icon {

12
packages/Webkul/Admin/src/Traits/Mails.php
View File

@ -135,7 +135,7 @@ trait Mails
public function sendNewShipmentMail($shipment)
{
$customerLocale = $this->getLocale($shipment);
try {
if ($shipment->email_sent) {
return;
@ -248,7 +248,15 @@ trait Mails
app()->setLocale($locale);
Mail::queue($notification);
try {
Mail::queue($notification);
} catch(\Exception $e) {
app()->setLocale($previousLocale);
\Log::error(
'prepareMail' . $e->getMessage()
);
}
app()->setLocale($previousLocale);
}