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

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahulshukla-home 2020-05-11 09:52:02 +05:30
parent 3af919ee5f eb527f34e8
commit 9fb5d2f75e
10 changed files with 157 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/Webkul/Admin/src/Config/system.php
View File

@ -126,10 +126,63 @@ return [
'type' => 'boolean',
],
],
], [
'key' => 'catalog.products.storefront',
'name' => 'admin::app.admin.system.storefront',
'sort' => 2,
'fields' => [
[
'name' => 'mode',
'title' => 'admin::app.admin.system.default-list-mode',
'type' => 'select',
'options' => [
[
'title' => 'admin::app.admin.system.grid',
'value' => 'grid',
], [
'title' => 'admin::app.admin.system.list',
'value' => 'list',
],
],
'channel_based' => true,
], [
'name' => 'products_per_page',
'title' => 'admin::app.admin.system.products-per-page',
'type' => 'text',
'info' => 'admin::app.admin.system.comma-seperated',
'channel_based' => true,
], [
'name' => 'sort_by',
'title' => 'admin::app.admin.system.sort-by',
'type' => 'select',
'options' => [
[
'title' => 'admin::app.admin.system.from-z-a',
'value' => 'name-desc',
], [
'title' => 'admin::app.admin.system.from-a-z',
'value' => 'name-asc',
], [
'title' => 'admin::app.admin.system.newest-first',
'value' => 'created_at-desc',
], [
'title' => 'admin::app.admin.system.oldest-first',
'value' => 'created_at-asc',
], [
'title' => 'admin::app.admin.system.cheapest-first',
'value' => 'price-asc',
], [
'title' => 'admin::app.admin.system.expensive-first',
'value' => 'price-desc',
],
],
'channel_based' => true,
]
],
], [
'key' => 'catalog.products.review',
'name' => 'admin::app.admin.system.review',
'sort' => 2,
'sort' => 3,
'fields' => [
[
'name' => 'guest_review',

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

@ -1309,7 +1309,20 @@ return [
'all-channels' => 'الكل',
'all-locales' => 'الكل',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon'
]
]

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

@ -1317,7 +1317,20 @@ return [
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon'
]
]

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

@ -1315,7 +1315,20 @@ return [
'all-locales' => 'همه',
'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon'
]
]

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

@ -1314,7 +1314,20 @@ return [
'all-channels' => 'Alles',
'all-locales' => 'Alles',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'logo',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon'
]
]

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

@ -1318,7 +1318,20 @@ return [
'all-locales' => 'Todos',
'sandbox' => 'Sandbox',
'invoice-slip-design' => 'Design da Nota do Pedido',
'logo' => 'logo',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon'
]
]

7
packages/Webkul/Core/src/Contracts/Address.php Normal file
View File

@ -0,0 +1,7 @@
<?php
namespace Webkul\Core\Contracts;
interface Address
{
}

3
packages/Webkul/Core/src/Models/Address.php
View File

@ -8,6 +8,7 @@ use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Webkul\Customer\Models\Customer;
use Webkul\Core\Contracts\Address as AddressContract;
/**
* Class Address
@ -37,7 +38,7 @@ use Webkul\Customer\Models\Customer;
* @property-read Carbon $updated_at
*
*/
abstract class Address extends Model
abstract class Address extends Model implements AddressContract
{
protected $table = 'addresses';

10
packages/Webkul/Core/src/Models/AddressProxy.php Normal file
View File

@ -0,0 +1,10 @@
<?php
namespace Webkul\Core\Models;
use Konekt\Concord\Proxies\ModelProxy;
class AddressProxy extends ModelProxy
{
}

18
packages/Webkul/Product/src/Helpers/Toolbar.php
View File

@ -27,7 +27,9 @@ class Toolbar extends AbstractProduct
*/
public function getAvailableLimits()
{
return [9, 15, 21, 28];
return core()->getConfigData('catalog.products.storefront.products_per_page')
? explode(',', core()->getConfigData('catalog.products.storefront.products_per_page'))
: [9, 15, 21, 28];
}
/**
@ -84,8 +86,14 @@ class Toolbar extends AbstractProduct
if (isset($params['sort']) && $key == $params['sort'] . '-' . $params['order']) {
return true;
} elseif (! isset($params['sort']) && $key == 'created_at-asc') {
return true;
} elseif (! isset($params['sort'])) {
$sortBy = core()->getConfigData('catalog.products.storefront.sort_by')
? core()->getConfigData('catalog.products.storefront.sort_by')
: 'created_at-asc';
if ($key == $sortBy) {
return true;
}
}
return false;
@ -138,6 +146,8 @@ class Toolbar extends AbstractProduct
return $params['mode'];
}
return 'grid';
return core()->getConfigData('catalog.products.storefront.mode')
? core()->getConfigData('catalog.products.storefront.mode')
: 'grid';
}
}