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

Merge pull request #2690 from rahulshukla-webkul/development 

Issue #2549
This commit is contained in:
Jitendra Singh 2020-03-18 18:52:02 +05:30 committed by GitHub
parent 18c790b232 7174ccbfd0
commit 7faf5bb97f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -949,7 +949,9 @@ return [
'order-number-length' => 'Order Number Length',
'order-number-suffix' => 'Order Number Suffix',
'default' => 'Default',
'sandbox' => 'Sandbox'
'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo'
]
]
];

6
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -1301,7 +1301,9 @@ return [
'default' => 'Default',
'sandbox' => 'Sandbox',
'all-channels' => 'All',
'all-locales' => 'All'
]
'all-locales' => 'All',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo'
]
]
];

4
packages/Webkul/Admin/src/Resources/lang/fa/app.php
View File

@ -1070,7 +1070,9 @@ return [
'credit-max' => 'اعتبار مشتری حداکثر',
'credit-max-value' => 'حداکثر میزان اعتبار',
'use-credit-max' => 'استفاده از حداکثر اعتبار',
'sandbox' => 'Sandbox'
'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo'
]
]
];

4
packages/Webkul/Admin/src/Resources/lang/nl/app.php
View File

@ -1298,7 +1298,9 @@ return [
'default' => 'Standaard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alles',
'all-locales' => 'Alles'
'all-locales' => 'Alles',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo'
]
]
];

4
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -1058,7 +1058,9 @@ return [
'order-number-prefix' => 'Order Number Prefix',
'order-number-length' => 'Order Number Length',
'order-number-suffix' => 'Order Number Suffix',
'sandbox' => 'Sandbox'
'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo'
]
]
];

16
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -75,12 +75,28 @@
font-weight: 600;
}
.logo {
height: 70px;
width: 70px;
}
</style>
</head>
<body style="background-image: none;background-color: #fff;">
<div class="container">
<div class="header">
<div class="image">
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
</div>
<div class="address">
<p>
<b> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }} </b>
</p>
</div>
</div>
<div class="invoice-summary">
<div class="row">

19
packages/Webkul/Sales/src/Config/system.php
View File

@ -35,5 +35,24 @@ return [
'locale_based' => true,
],
]
], [
'key' => 'sales.orderSettings.invoice_slip_design',
'name' => 'admin::app.admin.system.invoice-slip-design',
'sort' => 1,
'fields' => [
[
'name' => 'logo',
'title' => 'admin::app.admin.system.logo',
'type' => 'image',
'validation' => 'mimes:jpeg,bmp,png,jpg',
'channel_based' => true,
],
[
'name' => 'address',
'title' => 'admin::app.admin.system.address',
'type' => 'textarea',
'channel_based' => true,
]
]
]
];

16
packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
View File

@ -79,12 +79,28 @@
font-weight: 600;
}
.logo {
height: 70px;
width: 70px;
}
</style>
</head>
<body style="background-image: none;background-color: #fff;">
<div class="container">
<div class="header">
<div class="image">
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
</div>
<div class="address">
<p>
<b> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }} </b>
</p>
</div>
</div>
<div class="invoice-summary">
<div class="row">