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

Merge remote-tracking branch 'upstream/master' into default-variant-enhancement

This commit is contained in:
devansh bawari 2021-06-22 09:47:00 +05:30
parent 2165121b0b 6bb5a4f380
commit 2457d63a83
21 changed files with 68 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -1,6 +1,6 @@
APP_NAME=Bagisto
APP_ENV=local
APP_VERSION=1.3.1
APP_VERSION=1.3.2
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost

4
.env.testing
View File

@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_VERSION=1.3.1
APP_VERSION=1.3.2
APP_KEY=base64:G4KY3tUsTaY9ONo1n/QyJvVLQZdJDgbIkSJswFK01HE=
APP_DEBUG=true
APP_URL=http://localhost
@ -43,4 +43,4 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
SHOP_MAIL_FROM=test@example.com
ADMIN_MAIL_TO=test@example.com
ADMIN_MAIL_TO=test@example.com

32
packages/Webkul/Admin/src/DataGrids/CustomersInvoicesDataGrid.php
View File

@ -10,15 +10,31 @@ class CustomersInvoicesDataGrid extends DataGrid
{
use ProvideDataGridPlus;
/**
* Index column.
*
* @var int
*/
protected $index = 'id';
/**
* Default sort order of datagrid.
*
* @var string
*/
protected $sortOrder = 'desc';
/**
* Prepare query.
*
* @return void
*/
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('invoices')
->leftJoin('orders as ors', 'invoices.order_id', '=', 'ors.id')
->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'ors.channel_name as channel_name', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at');
->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'ors.channel_name as channel_name', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at')
->where('ors.customer_id', request('id'));
$this->addFilter('id', 'invoices.id');
$this->addFilter('order_id', 'ors.increment_id');
@ -28,6 +44,11 @@ class CustomersInvoicesDataGrid extends DataGrid
$this->setQueryBuilder($queryBuilder);
}
/**
* Add columns.
*
* @return void
*/
public function addColumns()
{
$this->addColumn([
@ -66,7 +87,7 @@ class CustomersInvoicesDataGrid extends DataGrid
'closure' => true,
'filterable' => true,
'wrapper' => function ($value) {
return '<a href="'. route('admin.sales.orders.view', $value->order_id). '">' . $value->order_id . '</a>';
return '<a href="' . route('admin.sales.orders.view', $value->order_id) . '">' . $value->order_id . '</a>';
}
]);
@ -101,6 +122,11 @@ class CustomersInvoicesDataGrid extends DataGrid
]);
}
/**
* Prepare actions.
*
* @return void
*/
public function prepareActions()
{
$this->addAction([
@ -110,4 +136,4 @@ class CustomersInvoicesDataGrid extends DataGrid
'icon' => 'icon eye-icon',
]);
}
}
}

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

@ -1433,8 +1433,8 @@ return [
'order-number-length' => 'طول رقم الطلب',
'order-number-suffix' => 'لاحقة رقم الطلب',
'order-number-generator-class' => 'مولد رقم الطلب',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'الحد الأدنى من إعدادات الطلب',
'minimum-order-amount' => 'الحد الأدنى للطلب',
'default' => 'إفتراضي',
'sandbox' => 'صندوق الرمل',
'all-channels' => 'الكل',

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

@ -1441,8 +1441,8 @@ return [
'order-number-length' => 'Auftragsnummer Länge',
'order-number-suffix' => 'Auftragsnummer Suffix',
'order-number-generator-class' => 'Bestell nummern generator',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'Einstellungen für die Mindestbestellmenge',
'minimum-order-amount' => 'Mindestbestellmenge',
'default' => 'Standard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alle',

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

@ -1425,8 +1425,8 @@ return [
'order-number-length' => 'طول شماره سفارش',
'order-number-suffix' => 'تعداد کافی شماره سفارش',
'order-number-generator-class' => 'تولید کننده شماره سفارش',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'حداقل تنظیمات سفارش',
'minimum-order-amount' => 'حداقل مقدار سفارش',
'default' => 'پیش فرض',
'sandbox' => 'Sandbox',
'all-channels' => 'همه',

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

@ -1433,8 +1433,8 @@ return [
'order-number-length' => 'Lunghezza Numero Ordine',
'order-number-suffix' => 'Suffisso Numero Ordine',
'order-number-generator-class' => 'Generatore di numeri dordine',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'Impostazioni dell\'ordine minimo',
'minimum-order-amount' => 'Importo minimo dell\'ordine',
'default' => 'Default',
'sandbox' => 'Sandbox',
'all-channels' => 'Tutti',

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

@ -1430,8 +1430,8 @@ return [
'order-number-length' => 'Długość numeru zamówienia',
'order-number-suffix' => 'Sufiks numeru zamówienia”',
'order-number-generator-class' => 'Generator numeru zamówienia',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'Minimalne ustawienia zamówienia',
'minimum-order-amount' => 'Minimalna kwota zamówienia',
'default' => 'Domyślna',
'sandbox' => 'Piaskownica',
'all-channels' => 'Wszystkie kanały',

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

@ -1431,8 +1431,8 @@ return [
'order-number-length' => 'Tamanho do Número do Pedido',
'order-number-suffix' => 'Sufixo do Número de Pedido',
'order-number-generator-class' => 'Gerador de número de pedido',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'Configurações de pedido mínimo ',
'minimum-order-amount' => 'Quantidade Mínima do Pedido',
'default' => 'Padrão',
'sandbox' => 'Sandbox',
'all-channels' => 'Todos',

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

@ -1417,8 +1417,8 @@ return [
'order-number-length' => 'Numara Uzunluğu',
'order-number-suffix' => 'Numara Son Eki',
'order-number-generator-class' => 'Sipariş Numarası Üreticisi',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'Minimum Sipariş Ayarları',
'minimum-order-amount' => 'Minimum Sipariş Tutarı',
'default' => 'Varsayılan',
'sandbox' => 'Havuz',
'all-channels' => 'Tümü',

2
packages/Webkul/Core/src/Console/Commands/Install.php
View File

@ -55,7 +55,7 @@ class Install extends Command
// running `php artisan vendor:publish --all`
$this->warn('Step: Publishing assets and configurations...');
$result = $this->call('vendor:publish', ['--all']);
$result = $this->call('vendor:publish', ['--all' => true, '--force' => true]);
$this->info($result);
// running `php artisan storage:link`

2
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -504,7 +504,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'الحد الأدنى لمبلغ الطلب هو :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/de/app.php
View File

@ -497,7 +497,7 @@ return [
'cart-remove-action' => 'Wollen Sie dies wirklich tun?',
'partial-cart-update' => 'Nur einige der Produkte wurden aktualisiert',
'link-missing' => '',
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'Mindestbestellmenge ist :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -503,7 +503,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'La cantidad mínima de pedido es :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -500,7 +500,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'حداقل مقدار سفارش است :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/it/app.php
View File

@ -501,7 +501,7 @@ return [
'event' => [
'expired' => 'Questo evento è terminato.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'L\'importo minimo dell\'ordine è :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/ja/app.php
View File

@ -462,7 +462,7 @@ return [
'cart-remove-action' => '手続きを進めますか。',
'partial-cart-update' => 'Only some of the product(s) were updated',
'link-missing' => '',
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => '最小注文額は :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -508,7 +508,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'Minimum orderbedrag is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/pl/app.php
View File

@ -500,7 +500,7 @@ return [
'event' => [
'expired' => 'To wydarzenie wygasło.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'Minimalna kwota zamówienia to :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

@ -493,7 +493,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Minimum order amount is :amount'
'minimum-order-message' => 'O valor mínimo do pedido é :amount'
],
'onepage' => [

15
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -69,7 +69,10 @@
<accordian :title="'{{ __('velocity::app.admin.meta-data.general') }}'" :active="true">
<div slot="body">
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.activate-slider') }}</label>
<label style="width:100%;">
{{ __('velocity::app.admin.meta-data.activate-slider') }}
<span class="locale">[{{ $channel }} - {{ $locale }}]</span>
</label>
<label class="switch">
<input
@ -85,7 +88,10 @@
</div>
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.sidebar-categories') }}</label>
<label style="width:100%;">
{{ __('velocity::app.admin.meta-data.sidebar-categories') }}
<span class="locale">[{{ $channel }} - {{ $locale }}]</span>
</label>
<input
type="number"
@ -97,7 +103,10 @@
</div>
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.header_content_count') }}</label>
<label style="width:100%;">
{{ __('velocity::app.admin.meta-data.header_content_count') }}
<span class="locale">[{{ $channel }} - {{ $locale }}]</span>
</label>
<input
type="number"