Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1

 Conflicts:
	composer.json
	composer.lock
	config/app.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
This commit is contained in:
merdan 2022-04-04 13:46:05 +05:00
commit d4d1da389f
203 changed files with 1716 additions and 3064 deletions

View File

@ -18,7 +18,6 @@
"diglactic/laravel-breadcrumbs": "^7.0",
"doctrine/dbal": "^2.9",
"enshrined/svg-sanitize": "^0.15.0",
"spatie/laravel-ignition": "^1.0",
"fakerphp/faker": "^1.14",
"flynsarmy/db-blade-compiler": "dev-master",
"guzzlehttp/guzzle": "^7.0.1",
@ -36,7 +35,9 @@
"maatwebsite/excel": "^3.1.26",
"prettus/l5-repository": "^2.6",
"pusher/pusher-php-server": "^7.0"
"pusher/pusher-php-server": "^7.0",
"spatie/laravel-ignition": "^1.0",
"spatie/laravel-sitemap": "^6.1"
},
"require-dev": {
"codeception/codeception": "*@dev",
@ -103,6 +104,7 @@
"Webkul\\DebugBar\\": "packages/Webkul/DebugBar/src",
"Webkul\\Marketing\\": "packages/Webkul/Marketing/src",
"Webkul\\Notification\\": "packages/Webkul/Notification/src",
"Webkul\\Sitemap\\": "packages/Webkul/Sitemap/src",
"Webkul\\Marketplace\\": "packages/Webkul/Marketplace/src",
"Sarga\\Shop\\": "packages/Sarga/Shop/src",
"Sarga\\API\\": "packages/Sarga/API",

View File

@ -282,12 +282,15 @@ return [
Webkul\Marketing\Providers\MarketingServiceProvider::class,
Webkul\Notification\Providers\NotificationServiceProvider::class,
Webkul\Marketplace\Providers\MarketplaceServiceProvider::class,
Webkul\Sitemap\Providers\SitemapServiceProvider::class,
Sarga\Shop\Providers\ShopServiceProvider::class,
Sarga\API\Providers\APIServiceProvider::class,
Sarga\Admin\Providers\AdminServiceProvider::class,
Sarga\Brand\Providers\BrandServiceProvider::class,
Sarga\Payment\Providers\PaymentServiceProvider::class,
],
/*

View File

@ -38,6 +38,7 @@ return [
\Webkul\Ui\Providers\ModuleServiceProvider::class,
\Webkul\User\Providers\ModuleServiceProvider::class,
\Webkul\Velocity\Providers\ModuleServiceProvider::class,
\Webkul\Sitemap\Providers\ModuleServiceProvider::class,
],
];

57
config/sitemap.php Normal file
View File

@ -0,0 +1,57 @@
<?php
use GuzzleHttp\RequestOptions;
use Spatie\Sitemap\Crawler\Profile;
return [
/*
* These options will be passed to GuzzleHttp\Client when it is created.
* For in-depth information on all options see the Guzzle docs:
*
* http://docs.guzzlephp.org/en/stable/request-options.html
*/
'guzzle_options' => [
/*
* Whether or not cookies are used in a request.
*/
RequestOptions::COOKIES => true,
/*
* The number of seconds to wait while trying to connect to a server.
* Use 0 to wait indefinitely.
*/
RequestOptions::CONNECT_TIMEOUT => 10,
/*
* The timeout of the request in seconds. Use 0 to wait indefinitely.
*/
RequestOptions::TIMEOUT => 10,
/*
* Describes the redirect behavior of a request.
*/
RequestOptions::ALLOW_REDIRECTS => false,
],
/*
* The sitemap generator can execute JavaScript on each page so it will
* discover links that are generated by your JS scripts. This feature
* is powered by headless Chrome.
*/
'execute_javascript' => false,
/*
* The package will make an educated guess as to where Google Chrome is installed.
* You can also manually pass it's location here.
*/
'chrome_binary_path' => null,
/*
* The sitemap generator uses a CrawlProfile implementation to determine
* which urls should be crawled for the sitemap.
*/
'crawl_profile' => Profile::class,
];

View File

@ -349,7 +349,7 @@ return [
'key' => 'marketing.promotions',
'name' => 'admin::app.acl.promotions',
'route' => 'admin.cart-rules.index',
'sort' => 6,
'sort' => 1,
], [
'key' => 'marketing.promotions.cart-rules',
'name' => 'admin::app.acl.cart-rules',
@ -399,7 +399,7 @@ return [
'key' => 'marketing.email-marketing',
'name' => 'admin::app.acl.email-marketing',
'route' => 'admin.email-templates.index',
'sort' => 7,
'sort' => 2,
], [
'key' => 'marketing.email-marketing.email-templates',
'name' => 'admin::app.acl.email-templates',
@ -409,22 +409,22 @@ return [
'key' => 'marketing.email-marketing.email-templates.create',
'name' => 'admin::app.acl.create',
'route' => 'admin.email-templates.create',
'sort' => 1,
'sort' => 2,
], [
'key' => 'marketing.email-marketing.email-templates.edit',
'name' => 'admin::app.acl.edit',
'route' => 'admin.email-templates.edit',
'sort' => 2,
'sort' => 3,
], [
'key' => 'marketing.email-marketing.email-templates.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.email-templates.delete',
'sort' => 3,
'sort' => 4,
], [
'key' => 'marketing.email-marketing.events',
'name' => 'admin::app.acl.events',
'route' => 'admin.events.index',
'sort' => 1,
'sort' => 2,
], [
'key' => 'marketing.email-marketing.events.create',
'name' => 'admin::app.acl.create',
@ -444,7 +444,7 @@ return [
'key' => 'marketing.email-marketing.campaigns',
'name' => 'admin::app.acl.campaigns',
'route' => 'admin.campaigns.index',
'sort' => 1,
'sort' => 3,
], [
'key' => 'marketing.email-marketing.campaigns.create',
'name' => 'admin::app.acl.create',
@ -464,16 +464,36 @@ return [
'key' => 'marketing.email-marketing.subscribers',
'name' => 'admin::app.acl.subscribers',
'route' => 'admin.customers.subscribers.index',
'sort' => 1,
'sort' => 4,
], [
'key' => 'marketing.email-marketing.subscribers.edit',
'name' => 'admin::app.acl.edit',
'route' => 'admin.customers.subscribers.edit',
'sort' => 2,
'sort' => 1,
], [
'key' => 'marketing.email-marketing.subscribers.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.customers.subscribers.delete',
'sort' => 2,
], [
'key' => 'marketing.sitemaps',
'name' => 'admin::app.acl.sitemaps',
'route' => 'admin.sitemaps.index',
'sort' => 3,
], [
'key' => 'marketing.sitemaps.create',
'name' => 'admin::app.acl.create',
'route' => 'admin.sitemaps.create',
'sort' => 1,
], [
'key' => 'marketing.sitemaps.edit',
'name' => 'admin::app.acl.edit',
'route' => 'admin.sitemaps.edit',
'sort' => 2,
], [
'key' => 'marketing.sitemaps.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.sitemaps.delete',
'sort' => 3,
],

View File

@ -235,6 +235,12 @@ return [
'route' => 'admin.customers.subscribers.index',
'sort' => 3,
'icon-class' => '',
], [
'key' => 'marketing.sitemaps',
'name' => 'admin::app.layouts.sitemaps',
'route' => 'admin.sitemaps.index',
'sort' => 3,
'icon-class' => '',
], [
'key' => 'cms',
'name' => 'admin::app.layouts.cms',

View File

@ -23,23 +23,14 @@ class AddressDataGrid extends DataGrid
*/
protected $sortOrder = 'desc';
/**
* Customer repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerRepository
*/
protected $customerRepository;
/**
* Create a new datagrid instance.
*
* @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository
* @return void
*/
public function __construct(CustomerRepository $customerRepository)
public function __construct(protected CustomerRepository $customerRepository)
{
$this->customerRepository = $customerRepository;
parent::__construct();
}

View File

@ -22,28 +22,17 @@ class ChannelDataGrid extends DataGrid
*/
protected $locale;
/**
* ChannelRepository $channelRepository
*
* @var \Webkul\Core\Repositories\ChannelRepository
*/
protected $channelRepository;
/**
* Create a new datagrid instance.
*
* @param \Webkul\Core\Repositories\ChannelRepository $channelRepository
* @return void
*/
public function __construct(
ChannelRepository $channelRepository
)
public function __construct(protected ChannelRepository $channelRepository)
{
parent::__construct();
$this->locale = core()->getRequestedLocaleCode();
$this->channelRepository = $channelRepository;
}
public function prepareQueryBuilder()

View File

@ -194,11 +194,15 @@ class ProductDataGrid extends DataGrid
'searchable' => false,
'filterable' => true,
'closure' => function ($value) {
$html = '';
if ($value->status == 1) {
return trans('admin::app.datagrid.active');
$html .= '<span class="badge badge-md badge-success">' . trans('admin::app.datagrid.active') . '</span>';
} else {
return trans('admin::app.datagrid.inactive');
$html .= '<span class="badge badge-md badge-danger">' . trans('admin::app.datagrid.inactive') . '</span>';
}
return $html;
},
]);

View File

@ -0,0 +1,81 @@
<?php
namespace Webkul\Admin\DataGrids;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Webkul\Ui\DataGrid\DataGrid;
class SitemapDataGrid extends DataGrid
{
protected $index = 'id';
protected $sortOrder = 'desc';
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('sitemaps')->addSelect('id', 'file_name', 'path', 'path as url');
$this->setQueryBuilder($queryBuilder);
}
public function addColumns()
{
$this->addColumn([
'index' => 'id',
'label' => trans('admin::app.datagrid.id'),
'type' => 'number',
'searchable' => false,
'sortable' => true,
'width' => '40px',
'filterable' => true,
]);
$this->addColumn([
'index' => 'file_name',
'label' => trans('admin::app.datagrid.file-name'),
'type' => 'string',
'searchable' => true,
'sortable' => true,
'filterable' => true,
]);
$this->addColumn([
'index' => 'path',
'label' => trans('admin::app.datagrid.path'),
'type' => 'string',
'searchable' => true,
'sortable' => true,
'filterable' => true,
]);
$this->addColumn([
'index' => 'url',
'label' => trans('admin::app.datagrid.link-for-google'),
'type' => 'string',
'searchable' => false,
'sortable' => false,
'filterable' => false,
'closure' => function ($row) {
return '<a href="' . ($url = Storage::url($row->path . '/' . $row->file_name)) . '">' . $url . '</a>';
},
]);
}
public function prepareActions()
{
$this->addAction([
'title' => trans('admin::app.datagrid.edit'),
'method' => 'GET',
'route' => 'admin.sitemaps.edit',
'icon' => 'icon pencil-lg-icon',
]);
$this->addAction([
'title' => trans('admin::app.datagrid.delete'),
'method' => 'POST',
'route' => 'admin.sitemaps.delete',
'icon' => 'icon trash-icon',
]);
}
}

View File

@ -8,22 +8,14 @@ use Maatwebsite\Excel\Concerns\ShouldAutoSize;
class DataGridExport implements FromView, ShouldAutoSize
{
/**
* DataGrid instance
*
* @var mixed
*/
protected $gridData = [];
/**
* Create a new instance.
*
* @param mixed DataGrid
* @return void
*/
public function __construct($gridData)
public function __construct(protected $gridData = [])
{
$this->gridData = $gridData;
}
/**

View File

@ -16,13 +16,6 @@ class ConfigurationController extends Controller
*/
protected $_config;
/**
* Core config repository instance.
*
* @var \Webkul\Core\Repositories\CoreConfigRepository
*/
protected $coreConfigRepository;
/**
* Tree instance.
*
@ -36,10 +29,8 @@ class ConfigurationController extends Controller
* @param \Webkul\Core\Repositories\CoreConfigRepository $coreConfigRepository
* @return void
*/
public function __construct(CoreConfigRepository $coreConfigRepository)
public function __construct(protected CoreConfigRepository $coreConfigRepository)
{
$this->coreConfigRepository = $coreConfigRepository;
$this->_config = request('_config');
$this->prepareConfigTree();

View File

@ -17,35 +17,18 @@ class AddressController extends Controller
*/
protected $_config;
/**
* CustomerRepository object
*
* @var \Webkul\Customer\Repositories\CustomerRepository
*/
protected $customerRepository;
/**
* CustomerAddressRepository object
*
* @var \Webkul\Customer\Repositories\CustomerAddressRepository
*/
protected $customerAddressRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository
* @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository
* @param \Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository
* @return void
*/
public function __construct(
CustomerRepository $customerRepository,
CustomerAddressRepository $customerAddressRepository
) {
$this->customerRepository = $customerRepository;
$this->customerAddressRepository = $customerAddressRepository;
protected CustomerRepository $customerRepository,
protected CustomerAddressRepository $customerAddressRepository
)
{
$this->_config = request('_config');
}

View File

@ -22,34 +22,6 @@ class CustomerController extends Controller
*/
protected $_config;
/**
* Customer repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerRepository
*/
protected $customerRepository;
/**
* Customer address repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerAddressRepository
*/
protected $customerAddressRepository;
/**
* Customer group repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerGroupRepository
*/
protected $customerGroupRepository;
/**
* Channel repository instance.
*
* @var \Webkul\Core\Repositories\ChannelRepository
*/
protected $channelRepository;
/**
* Create a new controller instance.
*
@ -59,20 +31,13 @@ class CustomerController extends Controller
* @param \Webkul\Core\Repositories\ChannelRepository $channelRepository
*/
public function __construct(
CustomerRepository $customerRepository,
CustomerAddressRepository $customerAddressRepository,
CustomerGroupRepository $customerGroupRepository,
ChannelRepository $channelRepository
) {
protected CustomerRepository $customerRepository,
protected CustomerAddressRepository $customerAddressRepository,
protected CustomerGroupRepository $customerGroupRepository,
protected ChannelRepository $channelRepository
)
{
$this->_config = request('_config');
$this->customerRepository = $customerRepository;
$this->customerAddressRepository = $customerAddressRepository;
$this->customerGroupRepository = $customerGroupRepository;
$this->channelRepository = $channelRepository;
}
/**

View File

@ -15,24 +15,15 @@ class CustomerGroupController extends Controller
*/
protected $_config;
/**
* Customer group repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerGroupRepository
*/
protected $customerGroupRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository;
* @return void
*/
public function __construct(CustomerGroupRepository $customerGroupRepository)
public function __construct(protected CustomerGroupRepository $customerGroupRepository)
{
$this->_config = request('_config');
$this->customerGroupRepository = $customerGroupRepository;
}
/**

View File

@ -19,41 +19,6 @@ class DashboardController extends Controller
*/
protected $_config;
/**
* Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* Order item repository instance.
*
* @var \Webkul\Sales\Repositories\OrderItemRepository
*/
protected $orderItemRepository;
/**
* Invoice repository instance.
*
* @var \Webkul\Sales\Repositories\InvoiceRepository
*/
protected $invoiceRepository;
/**
* Customer repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerRepository
*/
protected $customerRepository;
/**
* Product inventory repository instance.
*
* @var \Webkul\Product\Repositories\ProductInventoryRepository
*/
protected $productInventoryRepository;
/**
* Start date.
*
@ -92,23 +57,14 @@ class DashboardController extends Controller
* @return void
*/
public function __construct(
OrderRepository $orderRepository,
OrderItemRepository $orderItemRepository,
InvoiceRepository $invoiceRepository,
CustomerRepository $customerRepository,
ProductInventoryRepository $productInventoryRepository
) {
protected OrderRepository $orderRepository,
protected OrderItemRepository $orderItemRepository,
protected InvoiceRepository $invoiceRepository,
protected CustomerRepository $customerRepository,
protected ProductInventoryRepository $productInventoryRepository
)
{
$this->_config = request('_config');
$this->orderRepository = $orderRepository;
$this->orderItemRepository = $orderItemRepository;
$this->invoiceRepository = $invoiceRepository;
$this->customerRepository = $customerRepository;
$this->productInventoryRepository = $productInventoryRepository;
}
/**

View File

@ -22,20 +22,6 @@ class InvoiceController extends Controller
*/
protected $_config;
/**
* Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* Invoice repository instance.
*
* @var \Webkul\Sales\Repositories\InvoiceRepository
*/
protected $invoiceRepository;
/**
* Create a new controller instance.
*
@ -44,14 +30,11 @@ class InvoiceController extends Controller
* @return void
*/
public function __construct(
OrderRepository $orderRepository,
InvoiceRepository $invoiceRepository
) {
protected OrderRepository $orderRepository,
protected InvoiceRepository $invoiceRepository
)
{
$this->_config = request('_config');
$this->orderRepository = $orderRepository;
$this->invoiceRepository = $invoiceRepository;
}
/**

View File

@ -17,20 +17,6 @@ class OrderController extends Controller
*/
protected $_config;
/**
* OrderRepository object
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* OrderCommentRepository object
*
* @var \Webkul\Sales\Repositories\OrderCommentRepository
*/
protected $orderCommentRepository;
/**
* Create a new controller instance.
*
@ -39,15 +25,11 @@ class OrderController extends Controller
* @return void
*/
public function __construct(
OrderRepository $orderRepository,
OrderCommentRepository $orderCommentRepository
protected OrderRepository $orderRepository,
protected OrderCommentRepository $orderCommentRepository
)
{
$this->_config = request('_config');
$this->orderRepository = $orderRepository;
$this->orderCommentRepository = $orderCommentRepository;
}
/**

View File

@ -17,27 +17,6 @@ class RefundController extends Controller
*/
protected $_config;
/**
* Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* Order item repository instance.
*
* @var \Webkul\Sales\Repositories\OrderItemRepository
*/
protected $orderItemRepository;
/**
* Refund repository instance.
*
* @var \Webkul\Sales\Repositories\RefundRepository
*/
protected $refundRepository;
/**
* Create a new controller instance.
*
@ -47,17 +26,12 @@ class RefundController extends Controller
* @return void
*/
public function __construct(
OrderRepository $orderRepository,
OrderItemRepository $orderItemRepository,
RefundRepository $refundRepository
) {
protected OrderRepository $orderRepository,
protected OrderItemRepository $orderItemRepository,
protected RefundRepository $refundRepository
)
{
$this->_config = request('_config');
$this->orderRepository = $orderRepository;
$this->orderItemRepository = $orderItemRepository;
$this->refundRepository = $refundRepository;
}
/**

View File

@ -17,27 +17,6 @@ class ShipmentController extends Controller
*/
protected $_config;
/**
* Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* Order item repository instance.
*
* @var \Webkul\Sales\Repositories\OrderItemRepository
*/
protected $orderItemRepository;
/**
* Shipment repository instance.
*
* @var \Webkul\Sales\Repositories\ShipmentRepository
*/
protected $shipmentRepository;
/**
* Create a new controller instance.
*
@ -47,17 +26,12 @@ class ShipmentController extends Controller
* @return void
*/
public function __construct(
ShipmentRepository $shipmentRepository,
OrderRepository $orderRepository,
OrderItemRepository $orderItemRepository
) {
protected ShipmentRepository $shipmentRepository,
protected OrderRepository $orderRepository,
protected OrderItemRepository $orderItemRepository
)
{
$this->_config = request('_config');
$this->orderRepository = $orderRepository;
$this->orderItemRepository = $orderItemRepository;
$this->shipmentRepository = $shipmentRepository;
}
/**

View File

@ -19,27 +19,6 @@ class TransactionController extends Controller
*/
protected $_config;
/**
* Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* Order transaction repository instance.
*
* @var \Webkul\Sales\Repositories\OrderTransactionRepository
*/
protected $orderTransactionRepository;
/**
* Invoice repository instance.
*
* @var \Webkul\Sales\Repositories\InvoiceRepository
*/
protected $invoiceRepository;
/**
* Create a new controller instance.
*
@ -49,16 +28,12 @@ class TransactionController extends Controller
* @return void
*/
public function __construct(
OrderRepository $orderRepository,
OrderTransactionRepository $orderTransactionRepository,
InvoiceRepository $invoiceRepository) {
protected OrderRepository $orderRepository,
protected OrderTransactionRepository $orderTransactionRepository,
protected InvoiceRepository $invoiceRepository
)
{
$this->_config = request('_config');
$this->orderRepository = $orderRepository;
$this->orderTransactionRepository = $orderTransactionRepository;
$this->invoiceRepository = $invoiceRepository;
}
/**

View File

@ -7,21 +7,13 @@ use Webkul\Core\Repositories\LocaleRepository;
class Locale
{
/**
* Locale repository.
*
* @var LocaleRepository
*/
protected $locale;
/**
* Create a new middleware instance.
*
* @param \Webkul\Core\Repositories\LocaleRepository $locale
* @param \Webkul\Core\Repositories\LocaleRepository $localeRepository
*/
public function __construct(LocaleRepository $locale)
public function __construct(protected LocaleRepository $localeRepository)
{
$this->locale = $locale;
}
/**
@ -36,7 +28,7 @@ class Locale
$locale = request()->get('admin_locale');
if ($locale) {
if ($this->locale->findOneByField('code', $locale)) {
if ($this->localeRepository->findOneByField('code', $locale)) {
app()->setLocale($locale);
session()->put('admin_locale', $locale);

View File

@ -10,18 +10,12 @@ class CancelOrderAdminNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* @var \Webkul\Sales\Contracts\Order
*/
public $order;
/**
* @param \Webkul\Sales\Contracts\Order $order
* @return void
*/
public function __construct($order)
public function __construct(public $order)
{
$this->order = $order;
}
public function build()

View File

@ -11,18 +11,12 @@ class CancelOrderNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* @var \Webkul\Sales\Contracts\Order
*/
public $order;
/**
* @param \Webkul\Sales\Contracts\Order $order
* @return void
*/
public function __construct($order)
public function __construct(public $order)
{
$this->order = $order;
}
public function build()

View File

@ -10,20 +10,6 @@ class DuplicateInvoiceNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The invoice instance.
*
* @var \Webkul\Customer\Contracts\Invoice
*/
public $invoice;
/**
* Customer email.
*
* @var string
*/
public $customerEmail;
/**
* Create a new message instance.
*
@ -31,12 +17,11 @@ class DuplicateInvoiceNotification extends Mailable
* @param string $customerEmail
* @return void
*/
public function __construct($invoice, $customerEmail)
{
$this->invoice = $invoice;
$this->customerEmail = $customerEmail;
}
public function __construct(
public $invoice,
public $customerEmail
)
{}
/**
* Build the message.

View File

@ -11,20 +11,6 @@ class InvoiceOverdueReminder extends Mailable
{
use Queueable, SerializesModels;
/**
* The customer instance.
*
* @var \Webkul\Customer\Contracts\Customer
*/
public $customer;
/**
* The invoice instance.
*
* @var \Webkul\Sales\Contracts\Invoice
*/
public $invoice;
/**
* Create a new message instance.
*
@ -32,14 +18,10 @@ class InvoiceOverdueReminder extends Mailable
* @param \Webkul\Sales\Contracts\Invoice $invoice
*/
public function __construct(
$customer,
$invoice
public $customer,
public $invoice
)
{
$this->customer = $customer;
$this->invoice = $invoice;
}
{}
/**
* Build the message.

View File

@ -11,22 +11,14 @@ class NewAdminNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The order instance.
*
* @var \Webkul\Sales\Contracts\Order
*/
public $order;
/**
* Create a new message instance.
*
* @param \Webkul\Sales\Contracts\Order $order
* @return void
*/
public function __construct($order)
public function __construct(public $order)
{
$this->order = $order;
}
/**

View File

@ -11,20 +11,6 @@ class NewCustomerNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The customer instance.
*
* @var \Webkul\Customer\Contracts\Customer
*/
public $customer;
/**
* The password instance.
*
* @var string
*/
public $password;
/**
* Create a new message instance.
*
@ -33,13 +19,10 @@ class NewCustomerNotification extends Mailable
* @return void
*/
public function __construct(
$customer,
$password
public $customer,
public $password
)
{
$this->customer = $customer;
$this->password = $password;
}
/**

View File

@ -11,22 +11,14 @@ class NewInventorySourceNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The shipment instance.
*
* @var \Webkul\Customer\Contracts\Shipment
*/
public $shipment;
/**
* Create a new message instance.
*
* @param \Webkul\Customer\Contracts\Shipment $shipment
* @return void
*/
public function __construct($shipment)
public function __construct(public $shipment)
{
$this->shipment = $shipment;
}
/**

View File

@ -11,22 +11,14 @@ class NewInvoiceNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The invoice instance.
*
* @param \Webkul\Customer\Contracts\Invoice $invoice
*/
public $invoice;
/**
* Create a new message instance.
*
* @param \Webkul\Customer\Contracts\Invoice $invoice
* @return void
*/
public function __construct($invoice)
public function __construct(public $invoice)
{
$this->invoice = $invoice;
}
/**

View File

@ -11,22 +11,14 @@ class NewOrderNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The order instance.
*
* @var \Webkul\Sales\Contracts\Order $order
*/
public $order;
/**
* Create a new message instance.
*
* @param \Webkul\Sales\Contracts\Order $order
* @return void
*/
public function __construct($order)
public function __construct(public $order)
{
$this->order = $order;
}
/**

View File

@ -11,22 +11,14 @@ class NewRefundNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The refund instance.
*
* @var \Webkul\Sales\Contracts\Refund
*/
public $refund;
/**
* Create a new message instance.
*
* @param \Webkul\Sales\Contracts\Refund $refund
* @return void
*/
public function __construct($refund)
public function __construct(public $refund)
{
$this->refund = $refund;
}
/**

View File

@ -11,22 +11,14 @@ class NewShipmentNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The shipment instance.
*
* @var \Webkul\Sales\Contracts\Shipment
*/
public $shipment;
/**
* Create a new message instance.
*
* @param \Webkul\Sales\Contracts\Shipment $shipment
* @return void
*/
public function __construct($shipment)
public function __construct(public $shipment)
{
$this->shipment = $shipment;
}
/**

View File

@ -11,22 +11,14 @@ class OrderCommentNotification extends Mailable
{
use Queueable, SerializesModels;
/**
* The order comment instance.
*
* @var \Webkul\Sales\Contracts\OrderComment $comment
*/
public $comment;
/**
* Create a new message instance.
*
* @param \Webkul\Sales\Contracts\OrderComment $comment
* @return void
*/
public function __construct($comment)
public function __construct(public $comment)
{
$this->comment = $comment;
}
/**

View File

@ -80,6 +80,8 @@ return [
'email-marketing' => 'التسويق عبر البريد الإلكتروني',
'campaigns' => 'الحملات',
'email-templates' => 'قوالب البريد الإلكتروني',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'خصم',
'cms' => 'CMS',
'transactions' => 'المعاملات',
@ -130,6 +132,13 @@ return [
'promotions' => 'الترقيات',
'cart-rules' => 'قواعد سلة التسوق',
'catalog-rules' => 'قواعد الكتالوج',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -248,6 +257,9 @@ return [
'update-status' => 'تحديث الحالة',
'transaction-id' => 'Transaction Id',
'transaction-date' => 'Transaction Date',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1269,6 +1281,21 @@ return [
'delete-success' => 'تم حذف الحدث بنجاح.',
'edit-error' => 'لا يمكن تعديل هذا الحدث.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -77,6 +77,8 @@ return [
'email-marketing' => 'Email Marketing',
'campaigns' => 'Campaigns',
'email-templates' => 'Email Templates',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'tax-categories' => 'Steuer-Kategorien',
'tax-rates' => 'Steuersätze',
'discount' => 'Rabatt',
@ -129,6 +131,13 @@ return [
'promotions' => 'Promotions',
'cart-rules' => 'Warenkorbregeln',
'catalog-rules' => 'Katalogregeln',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' =>
[
@ -247,6 +256,9 @@ return [
'update-status' => 'Update-Status',
'transaction-id' => 'Transaction Id',
'transaction-date' => 'Transaction Date',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' =>
[
@ -1270,6 +1282,21 @@ return [
'delete-success' => 'Event deleted successfully.',
'edit-error' => 'Can not edit this event.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' =>

View File

@ -81,6 +81,7 @@ return [
'campaigns' => 'Campaigns',
'email-templates' => 'Email Templates',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'Discount',
'cms' => 'CMS',
'transactions' => 'Transactions',
@ -135,6 +136,7 @@ return [
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
@ -257,6 +259,9 @@ return [
'date' => 'Date',
'transaction-id' => 'Transaction ID',
'transaction-date' => 'Transaction Date',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1291,6 +1296,21 @@ return [
'delete-success' => 'Event deleted successfully.',
'edit-error' => 'Can not edit this event.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -81,6 +81,7 @@ return [
'campaigns' => 'Campañas',
'email-templates' => 'Plantillas de Email',
'events' => 'Eventos',
'sitemaps' => 'Sitemaps',
'discount' => 'Descuento',
'cms' => 'CMS',
'transactions' => 'Transakcioj',
@ -136,6 +137,8 @@ return [
'campaigns' => 'Campañas',
'subscribers' => 'Suscriptores del Boletín',
'events' => 'Eventos',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -257,6 +260,9 @@ return [
'date' => 'Fecha',
'transaction-id' => 'Transacción #',
'transaction-date' => 'Fecha de Transacción',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1278,6 +1284,21 @@ return [
'delete-success' => 'Evento borrado con éxito.',
'edit-error' => 'No se puede editar este evento.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -79,6 +79,8 @@ return [
'email-marketing' => 'بازاریابی ایمیل',
'campaigns' => 'کمپین ها',
'email-templates' => 'قالب های ایمیل',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'تخفیف',
'cms' => 'مدیری محتوا',
'transactions' => 'پرداختی ها',
@ -128,6 +130,13 @@ return [
'promotions' => 'تبلیغات',
'cart-rules' => 'قوانین سبد خرید',
'catalog-rules' => 'قوانین فهرست',
'email-marketing' => 'Email Márketing',
'email-templates' => 'Plantillas de Email',
'campaigns' => 'Campañas',
'subscribers' => 'Suscriptores del Boletín',
'events' => 'Eventos',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -247,6 +256,9 @@ return [
'transaction-date' => 'تارید پرداخت',
'date' => 'تاریخ',
'subject' => 'موضوع',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1257,6 +1269,21 @@ return [
'delete-success' => 'رویداد مورد نظر حذف شد.',
'edit-error' => 'شما نمی توانید این رویداد را ویرایش کنید.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -80,6 +80,7 @@ return [
'campaigns' => 'Campagnes',
'email-templates' => 'Modèles d\'e-mails',
'events' => 'Événements',
'sitemaps' => 'Sitemaps',
'discount' => 'Rabais',
'cms' => 'CMS',
'transactions' => 'Transactions',
@ -135,6 +136,7 @@ return [
'campaigns' => 'Campagnes',
'subscribers' => 'Abonnés à la newsletter',
'events' => 'Événements',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Abonnement à la Newsletter',
],
@ -257,6 +259,9 @@ return [
'date' => 'Date',
'transaction-id' => 'identifiant de transaction',
'transaction-date' => 'Date de la transaction',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1289,6 +1294,21 @@ return [
'delete-success' => 'Événement supprimé avec succès.',
'edit-error' => 'Impossible de modifier cet événement.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -81,6 +81,7 @@ return [
'campaigns' => 'अभियान',
'email-templates' => 'ईमेल टेम्प्लेट',
'events' => 'आयोजन',
'sitemaps' => 'Sitemaps',
'discount' => 'छूट',
'cms' => 'सीएमएस',
'transactions' => 'लेनदेन',
@ -135,6 +136,7 @@ return [
'campaigns' => 'अभियान',
'subscribers' => 'न्यूज़लेटर सब्सक्राइबर्स',
'events' => 'आयोजन',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'न्यूज़लेटर सदस्यता',
],
@ -257,6 +259,9 @@ return [
'date' => 'तारीख',
'transaction-id' => 'लेनदेन आईडी',
'transaction-date' => 'कार्यवाही की तिथि',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1291,6 +1296,21 @@ return [
'delete-success' => 'ईवेंट सफलतापूर्वक हटाया गया।',
'edit-error' => 'इस घटना को संपादित नहीं कर सकता।',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -79,6 +79,8 @@ return [
'email-marketing' => 'Email Marketing',
'campaigns' => 'Campaigns',
'email-templates' => 'Email Templates',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'Sconti',
'cms' => 'CMS',
'transactions' => 'Transactions',
@ -127,6 +129,13 @@ return [
'promotions' => 'Promozioni',
'cart-rules' => 'Regole Carrello',
'catalog-rules' => 'Regole Catalogo',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -245,6 +254,9 @@ return [
'update-status' => 'Update Stato',
'transaction-id' => 'Transaction Id',
'transaction-date' => 'Transaction Date',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1260,6 +1272,21 @@ return [
'delete-success' => 'Event deleted successfully.',
'edit-error' => 'Can not edit this event.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -79,6 +79,8 @@ return [
'email-marketing' => 'Email Marketing',
'campaigns' => 'Campaigns',
'email-templates' => 'Email Templates',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'Korting',
'cms' => 'CMS',
'transactions' => 'Transacties',
@ -129,6 +131,13 @@ return [
'promotions' => 'Promoties',
'cart-rules' => 'Cart Rules',
'catalog-rules' => 'Catalog Rules',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -245,6 +254,9 @@ return [
'rtl' => 'RTL',
'ltr' => 'LTR',
'update-status' => 'Update Status',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1256,6 +1268,21 @@ return [
'delete-success' => 'Event deleted successfully.',
'edit-error' => 'Can not edit this event.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -77,6 +77,8 @@ return [
'promotions' => 'Promocje',
'email-marketing' => 'Email Marketing',
'campaigns' => 'Campaigns',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'email-templates' => 'Email Templates',
'discount' => 'Rabat',
'cms' => 'System CMS',
@ -126,6 +128,13 @@ return [
'promotions' => 'Promocje',
'cart-rules' => 'Zasady koszyka',
'catalog-rules' => 'Zasady katalogu',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -243,6 +252,9 @@ return [
'update-status' => 'Aktualizcja statusu',
'transaction-id' => 'Transaction Id',
'transaction-date' => 'Transaction Date',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1257,6 +1269,21 @@ return [
'delete-success' => 'Event deleted successfully.',
'edit-error' => 'Can not edit this event.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -79,6 +79,8 @@ return [
'email-marketing' => 'Email Marketing',
'campaigns' => 'Campanhas',
'email-templates' => 'Email Templates',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'Desconto',
'cms' => 'CMS',
'transactions' => 'Transações',
@ -127,6 +129,13 @@ return [
'promotions' => 'Promoções',
'cart-rules' => 'Regras do Carrinho',
'catalog-rules' => 'Regras do Catálogo',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -244,6 +253,9 @@ return [
'update-status' => 'Atualizar o status',
'transaction-id' => 'Transaction Id',
'transaction-date' => 'Transaction Date',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1256,6 +1268,21 @@ return [
'delete-success' => 'Event deleted successfully.',
'edit-error' => 'Não é possível editar esse evento.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -77,6 +77,8 @@ return [
'email-marketing' => 'Email Marketing',
'campaigns' => 'Campaigns',
'email-templates' => 'Email Templates',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'discount' => 'İndirim',
'cms' => 'CMS',
'transactions' => 'işlemler',
@ -127,6 +129,13 @@ return [
'promotions' => 'Promosyonlar',
'cart-rules' => 'Alışveriş Sepeti Kuralları',
'catalog-rules' => 'Katalog Kuralları',
'email-marketing' => 'Email Marketing',
'email-templates' => 'Email Templates',
'campaigns' => 'Campaigns',
'subscribers' => 'Newsletter Subscribers',
'events' => 'Events',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => 'Newsletter Subscriptions',
],
'dashboard' => [
@ -244,6 +253,9 @@ return [
'update-status' => 'Durum Güncelle',
'transaction-id' => 'İşlem Id',
'transaction-date' => 'İşlem Tarihi',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1256,6 +1268,21 @@ return [
'delete-success' => 'Etkinlik başarıyla silindi.',
'edit-error' => 'Bu etkinlik düzenlenemiyor.',
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],
'error' => [

View File

@ -80,6 +80,7 @@ return [
'campaigns' => '广告活动',
'email-templates' => '邮件模板',
'events' => '事件列表',
'sitemaps' => 'Sitemaps',
'discount' => '折扣',
'cms' => 'CMS',
'transactions' => '事物列表',
@ -87,52 +88,53 @@ return [
],
'acl' => [
'dashboard' => '仪表盘',
'sales' => '销售列表',
'cancel' => '取消',
'orders' => '订单列表',
'shipments' => '发货列表',
'invoices' => '发票列表',
'refunds' => '退款列表',
'catalog' => '商品目录',
'products' => '产品列表',
'copy' => '复制',
'categories' => '分类列表',
'attributes' => '属性列表',
'attribute-families' => '属性家族',
'customers' => '客户列表',
'addresses' => '地址列表',
'note' => '备注',
'groups' => '客户群',
'reviews' => '评论列表',
'configure' => '全局配置',
'settings' => '系统设置',
'locales' => '多语言',
'currencies' => '货币列表',
'exchange-rates' => '汇率换算',
'inventory-sources' => '货源列表',
'channels' => '渠道列表',
'users' => '后台用户',
'roles' => '权限规则',
'sliders' => '图片轮播',
'taxes' => '税务列表',
'tax-categories' => '税务分类',
'tax-rates' => '税率',
'view' => '查看',
'edit' => '编辑',
'create' => '添加',
'delete' => '删除',
'mass-delete' => '批量删除',
'mass-update' => '批量更新',
'marketing' => '市场营销',
'promotions' => '促销活动',
'cart-rules' => '购物车规则',
'catalog-rules' => '商品目录规则',
'email-marketing' => '邮件营销',
'email-templates' => '邮件模板',
'campaigns' => '活动列表',
'subscribers' => '邮件订阅',
'events' => '事件列表',
'dashboard' => '仪表盘',
'sales' => '销售列表',
'cancel' => '取消',
'orders' => '订单列表',
'shipments' => '发货列表',
'invoices' => '发票列表',
'refunds' => '退款列表',
'catalog' => '商品目录',
'products' => '产品列表',
'copy' => '复制',
'categories' => '分类列表',
'attributes' => '属性列表',
'attribute-families' => '属性家族',
'customers' => '客户列表',
'addresses' => '地址列表',
'note' => '备注',
'groups' => '客户群',
'reviews' => '评论列表',
'configure' => '全局配置',
'settings' => '系统设置',
'locales' => '多语言',
'currencies' => '货币列表',
'exchange-rates' => '汇率换算',
'inventory-sources' => '货源列表',
'channels' => '渠道列表',
'users' => '后台用户',
'roles' => '权限规则',
'sliders' => '图片轮播',
'taxes' => '税务列表',
'tax-categories' => '税务分类',
'tax-rates' => '税率',
'view' => '查看',
'edit' => '编辑',
'create' => '添加',
'delete' => '删除',
'mass-delete' => '批量删除',
'mass-update' => '批量更新',
'marketing' => '市场营销',
'promotions' => '促销活动',
'cart-rules' => '购物车规则',
'catalog-rules' => '商品目录规则',
'email-marketing' => '邮件营销',
'email-templates' => '邮件模板',
'campaigns' => '活动列表',
'subscribers' => '邮件订阅',
'events' => '事件列表',
'sitemaps' => 'Sitemaps',
'newsletter-subscriptions' => '邮件列表订阅',
],
@ -255,6 +257,9 @@ return [
'date' => '日期',
'transaction-id' => '交易ID',
'transaction-date' => '交易日期',
'file-name' => 'File Name',
'path' => 'Path',
'link-for-google' => 'Link For Google',
],
'account' => [
@ -1264,6 +1269,21 @@ return [
'update-success' => '事件更新成功.',
'delete-success' => '事件删除成功.',
'edit-error' => '无法编辑此活动.'
],
'sitemaps' => [
'title' => 'Sitemaps',
'add-title' => 'Add Sitemap',
'edit-title' => 'Edit Sitemap',
'save-btn-title' => 'Save',
'general' => 'General',
'file-name' => 'File Name',
'file-name-info' => 'Example: sitemap.xml',
'path' => 'Path',
'path-info' => 'Example: "/sitemap/" or "/" for base path',
'create-success' => 'Sitemap created successfully.',
'update-success' => 'Sitemap updated successfully.',
'delete-success' => 'Sitemap deleted successfully.',
]
],

View File

@ -0,0 +1,58 @@
@extends('admin::layouts.content')
@section('page_title')
{{ __('admin::app.marketing.sitemaps.add-title') }}
@stop
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.sitemaps.store') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="page-header">
<div class="page-title">
<h1>
<i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sitemaps.index') }}'"></i>
{{ __('admin::app.marketing.sitemaps.add-title') }}
</h1>
</div>
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.marketing.sitemaps.save-btn-title') }}
</button>
</div>
</div>
<div class="page-content">
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.marketing.sitemaps.create.before') !!}
<accordian title="{{ __('admin::app.marketing.sitemaps.general') }}" :active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('file_name') ? 'has-error' : '']">
<label for="file_name" class="required">{{ __('admin::app.marketing.sitemaps.file-name') }}</label>
<input v-validate="'required'" class="control" id="file_name" name="file_name" value="{{ old('file_name') }}" data-vv-as="&quot;{{ __('admin::app.marketing.sitemaps.file-name') }}&quot;"/>
<span class="control-error" v-if="errors.has('file_name')">@{{ errors.first('file_name') }}</span>
<span class="control-info">{{ __('admin::app.marketing.sitemaps.file-name-info') }}</span>
</div>
<div class="control-group" :class="[errors.has('path') ? 'has-error' : '']">
<label for="path" class="required">{{ __('admin::app.marketing.sitemaps.path') }}</label>
<input v-validate="'required'" class="control" id="path" name="path" value="{{ old('path') }}" data-vv-as="&quot;{{ __('admin::app.marketing.sitemaps.path') }}&quot;"/>
<span class="control-error" v-if="errors.has('path')">@{{ errors.first('path') }}</span>
<span class="control-info">{{ __('admin::app.marketing.sitemaps.path-info') }}</span>
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.marketing.sitemaps.create.after') !!}
</div>
</div>
</form>
</div>
@stop

View File

@ -0,0 +1,60 @@
@extends('admin::layouts.content')
@section('page_title')
{{ __('admin::app.marketing.sitemaps.edit-title') }}
@stop
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.sitemaps.update', $sitemap->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="page-header">
<div class="page-title">
<h1>
<i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sitemaps.index') }}'"></i>
{{ __('admin::app.marketing.sitemaps.edit-title') }}
</h1>
</div>
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.marketing.sitemaps.save-btn-title') }}
</button>
</div>
</div>
<div class="page-content">
<div class="form-container">
@csrf()
<input name="_method" type="hidden" value="PUT">
{!! view_render_event('bagisto.admin.marketing.sitemaps.update.before') !!}
<accordian title="{{ __('admin::app.marketing.sitemaps.general') }}" :active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('file_name') ? 'has-error' : '']">
<label for="file_name" class="required">{{ __('admin::app.marketing.sitemaps.file-name') }}</label>
<input v-validate="'required'" class="control" id="file_name" name="file_name" value="{{ old('file_name') ?: $sitemap->file_name }}" data-vv-as="&quot;{{ __('admin::app.marketing.sitemaps.file-name') }}&quot;"/>
<span class="control-error" v-if="errors.has('file_name')">@{{ errors.first('file_name') }}</span>
<span class="control-info">{{ __('admin::app.marketing.sitemaps.file-name-info') }}</span>
</div>
<div class="control-group" :class="[errors.has('path') ? 'has-error' : '']">
<label for="path" class="required">{{ __('admin::app.marketing.sitemaps.path') }}</label>
<input v-validate="'required'" class="control" id="path" name="path" value="{{ old('path') ?: $sitemap->path }}" data-vv-as="&quot;{{ __('admin::app.marketing.sitemaps.path') }}&quot;"/>
<span class="control-error" v-if="errors.has('path')">@{{ errors.first('path') }}</span>
<span class="control-info">{{ __('admin::app.marketing.sitemaps.path-info') }}</span>
</div>
</div>
</accordian>
{!! view_render_event('bagisto.admin.marketing.sitemaps.update.after') !!}
</div>
</div>
</form>
</div>
@stop

View File

@ -0,0 +1,25 @@
@extends('admin::layouts.content')
@section('page_title')
{{ __('admin::app.marketing.sitemaps.title') }}
@stop
@section('content')
<div class="content">
<div class="page-header">
<div class="page-title">
<h1>{{ __('admin::app.marketing.sitemaps.title') }}</h1>
</div>
<div class="page-action">
<a href="{{ route('admin.sitemaps.create') }}" class="btn btn-lg btn-primary">
{{ __('admin::app.marketing.sitemaps.add-title') }}
</a>
</div>
</div>
<div class="page-content">
<datagrid-plus src="{{ route('admin.sitemaps.index') }}"></datagrid-plus>
</div>
</div>
@endsection

View File

@ -8,6 +8,7 @@ use Webkul\Core\Http\Controllers\SubscriptionController;
use Webkul\Marketing\Http\Controllers\CampaignController;
use Webkul\Marketing\Http\Controllers\EventController;
use Webkul\Marketing\Http\Controllers\TemplateController;
use Webkul\Sitemap\Http\Controllers\Admin\SitemapController;
/**
* Marketing routes.
@ -171,5 +172,31 @@ Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => conf
Route::put('subscribers/update/{id}', [SubscriptionController::class, 'update'])->defaults('_config', [
'redirect' => 'admin.customers.subscribers.index',
])->name('admin.customers.subscribers.update');
/**
* Cart rules routes.
*/
Route::get('sitemaps', [SitemapController::class, 'index'])->defaults('_config', [
'view' => 'admin::marketing.sitemaps.index',
])->name('admin.sitemaps.index');
Route::get('sitemaps/create', [SitemapController::class, 'create'])->defaults('_config', [
'view' => 'admin::marketing.sitemaps.create',
])->name('admin.sitemaps.create');
Route::post('sitemaps/create', [SitemapController::class, 'store'])->defaults('_config', [
'redirect' => 'admin.sitemaps.index',
])->name('admin.sitemaps.store');
Route::get('sitemaps/edit/{id}', [SitemapController::class, 'edit'])->defaults('_config', [
'view' => 'admin::marketing.sitemaps.edit',
])->name('admin.sitemaps.edit');
Route::put('sitemaps/edit/{id}', [SitemapController::class, 'update'])->defaults('_config', [
'redirect' => 'admin.sitemaps.index',
])->name('admin.sitemaps.update');
Route::post('sitemaps/delete/{id}', [SitemapController::class, 'destroy'])->name('admin.sitemaps.delete');
});
});

View File

@ -25,31 +25,17 @@ class ProductCategoryUniqueSlug implements Rule
*/
protected $isSlugReserved = false;
/**
* Table name.
*
* @var string
*/
protected $tableName;
/**
* Table id.
*
* @var string
*/
protected $id;
/**
* Constructor.
*
* @param string $tableName
* @param string $id
*/
public function __construct($tableName = null, $id = null)
public function __construct(
protected $tableName = null,
protected $id = null
)
{
$this->tableName = $tableName;
$this->id = $id;
}
/**

View File

@ -14,23 +14,14 @@ class AttributeController extends Controller
*/
protected $_config;
/**
* Attribute repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository
* @return void
*/
public function __construct(AttributeRepository $attributeRepository)
public function __construct(protected AttributeRepository $attributeRepository)
{
$this->attributeRepository = $attributeRepository;
$this->_config = request('_config');
}

View File

@ -15,20 +15,6 @@ class AttributeFamilyController extends Controller
*/
protected $_config;
/**
* Attribute family repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeFamilyRepository
*/
protected $attributeFamilyRepository;
/**
* Attribute repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* Create a new controller instance.
*
@ -37,13 +23,10 @@ class AttributeFamilyController extends Controller
* @return void
*/
public function __construct(
AttributeFamilyRepository $attributeFamilyRepository,
AttributeRepository $attributeRepository
) {
$this->attributeFamilyRepository = $attributeFamilyRepository;
$this->attributeRepository = $attributeRepository;
protected AttributeFamilyRepository $attributeFamilyRepository,
protected AttributeRepository $attributeRepository
)
{
$this->_config = request('_config');
}

View File

@ -11,20 +11,6 @@ use Illuminate\Support\Str;
class AttributeFamilyRepository extends Repository
{
/**
* AttributeRepository object
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* AttributeGroupRepository object
*
* @var \Webkul\Attribute\Repositories\AttributeGroupRepository
*/
protected $attributeGroupRepository;
/**
* Create a new controller instance.
*
@ -33,15 +19,11 @@ class AttributeFamilyRepository extends Repository
* @return void
*/
public function __construct(
AttributeRepository $attributeRepository,
AttributeGroupRepository $attributeGroupRepository,
protected AttributeRepository $attributeRepository,
protected AttributeGroupRepository $attributeGroupRepository,
App $app
)
{
$this->attributeRepository = $attributeRepository;
$this->attributeGroupRepository = $attributeGroupRepository;
parent::__construct($app);
}

View File

@ -9,13 +9,6 @@ use Webkul\Core\Eloquent\Repository;
class AttributeRepository extends Repository
{
/**
* Attribute option repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeOptionRepository
*/
protected $attributeOptionRepository;
/**
* Create a new repository instance.
*
@ -23,11 +16,10 @@ class AttributeRepository extends Repository
* @return void
*/
public function __construct(
AttributeOptionRepository $attributeOptionRepository,
protected AttributeOptionRepository $attributeOptionRepository,
App $app
) {
$this->attributeOptionRepository = $attributeOptionRepository;
)
{
parent::__construct($app);
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"/css/default-booking.css": "/css/default-booking.css?id=76de1f2b8e064c1e9043",
"/css/velocity-booking.css": "/css/velocity-booking.css?id=847aebb5031ed219528e",
"/js/admin-booking.js": "/js/admin-booking.js?id=550f81bdc01469b71c46",
"/css/velocity-booking.css": "/css/velocity-booking.css?id=481d94b621e06671752a",
"/js/admin-booking.js": "/js/admin-booking.js?id=5cc56229ce47cbecd1be",
"/css/admin-booking.css": "/css/admin-booking.css?id=97f40d778fa7f81d69ff"
}

View File

@ -18,25 +18,11 @@ use Webkul\Checkout\Models\CartItem;
class Booking
{
/**
* BookingProductRepository
*
* @return \Webkul\BookingProduct\Repositories\BookingProductRepository
*/
protected $bookingProductRepository;
/**
* @return array
*/
protected $typeRepositories = [];
/**
* BookingRepository
*
* @return \Webkul\BookingProduct\Repositories\BookingRepository
*/
protected $bookingRepository;
/**
* @return array
*/
@ -66,17 +52,15 @@ class Booking
* @return void
*/
public function __construct(
BookingProductRepository $bookingProductRepository,
protected BookingProductRepository $bookingProductRepository,
protected BookingRepository $bookingRepository,
BookingProductDefaultSlotRepository $bookingProductDefaultSlotRepository,
BookingProductAppointmentSlotRepository $bookingProductAppointmentSlotRepository,
BookingProductEventTicketRepository $bookingProductEventTicketRepository,
BookingProductRentalSlotRepository $bookingProductRentalSlotRepository,
BookingProductTableSlotRepository $bookingProductTableSlotRepository,
BookingRepository $bookingRepository
)
{
$this->bookingProductRepository = $bookingProductRepository;
$this->typeRepositories['default'] = $bookingProductDefaultSlotRepository;
$this->typeRepositories['appointment'] = $bookingProductAppointmentSlotRepository;
@ -86,8 +70,6 @@ class Booking
$this->typeRepositories['rental'] = $bookingProductRentalSlotRepository;
$this->typeRepositories['table'] = $bookingProductTableSlotRepository;
$this->bookingRepository = $bookingRepository;
}
/**

View File

@ -16,22 +16,13 @@ class BookingController extends Controller
*/
protected $_config;
/**
* BookingRepository object
*
* @var \Webkul\BookingProduct\Repositories\BookingRepository
*/
protected $bookingRepository;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct(BookingRepository $bookingRepository)
public function __construct(protected BookingRepository $bookingRepository)
{
$this->bookingRepository = $bookingRepository;
$this->_config = request('_config');
}

View File

@ -29,7 +29,7 @@ class BookingProductController extends Controller
* @return void
*/
public function __construct(
BookingProductRepository $bookingProductRepository,
protected BookingProductRepository $bookingProductRepository,
DefaultSlotHelper $defaultSlotHelper,
AppointmentSlotHelper $appointmentSlotHelper,
RentalSlotHelper $rentalSlotHelper,

View File

@ -6,22 +6,14 @@ use Webkul\BookingProduct\Repositories\BookingRepository;
class Order
{
/**
* BookingRepository Object
*
* @var \Webkul\BookingProduct\Repositories\BookingRepository
*/
protected $bookingRepository;
/**
* Create a new listener instance.
*
* @param \Webkul\Booking\Repositories\BookingRepository $bookingRepository
* @return void
*/
public function __construct(BookingRepository $bookingRepository)
public function __construct(protected BookingRepository $bookingRepository)
{
$this->bookingRepository = $bookingRepository;
}
/**

View File

@ -1,8 +1,6 @@
@import "icons";
.booking-information {
margin-bottom: 15px;
.booking-info-row {
padding-left: 32px;
margin-bottom: 20px;
@ -110,6 +108,10 @@
.radio {
display: inline-block;
}
.control-error {
float: left;
}
}
.control-group-container {

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'معلومات عن الخدمة',
'location' => 'موقعك',
'contact' => 'مكالمة',
'email' => 'البريد الإلكتروني',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'location' => 'Location',
'contact' => 'Contact',
'email' => 'Email',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Información de reserva',
'location' => 'Ubicación',
'contact' => 'Contacto',
'email' => 'Correo Electrónico',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'اطلاعات مربوط به رزرو',
'location' => 'مکان',
'contact' => 'مخاطب',
'email' => 'پست الکترونیک',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'बुकिंग जानकारी',
'location' => 'स्थान',
'contact' => 'संपर्क करें',
'email' => 'ईमेल',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Informazioni sulla prenotazione',
'location' => 'Location',
'contact' => 'Contatto',
'email' => 'Email',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Boekingsinformatie',
'location' => 'Plaats',
'contact' => 'Contact',
'email' => 'Email',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'location' => 'Localização',
'contact' => 'Contato',
'email' => 'O email',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Rezervasyon bilgileri',
'location' => 'Konum',
'contact' => 'İletişim',
'email' => 'Email',

View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => '预订信息',
'location' => '位置',
'contact' => '联系',
'email' => '电子邮件',

View File

@ -4,7 +4,7 @@
<script type="text/x-template" id="book-slots-template">
<div class="book-slots">
<label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }} :</label>
<label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }}</label>
<div class="control-group-container">
<div class="control-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">

View File

@ -6,7 +6,18 @@
<link rel="stylesheet" href="{{ bagisto_asset('css/velocity-booking.css') }}">
@endpush
<booking-information></booking-information>
<accordian :title="'{{ __('bookingproduct::app.shop.products.booking-information') }}'" :active="true">
<div slot="header">
<h3 class="no-margin display-inbl">
{{ __('bookingproduct::app.shop.products.booking-information') }}
</h3>
<i class="rango-arrow"></i>
</div>
<div slot="body">
<booking-information></booking-information>
</div>
</accordian>
@push('scripts')

View File

@ -7,7 +7,7 @@
<div v-if="renting_type == 'daily_hourly'">
<div class="form-group">
<label>{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
<span class="radio">
<input type="radio" id="daily-renting-type" name="booking[renting_type]" value="daily" v-model="sub_renting_type">
@ -27,7 +27,7 @@
<div v-if="renting_type != 'daily' && sub_renting_type == 'hourly'">
<div>
<label>{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
@ -50,7 +50,7 @@
</div>
<div v-if="slots[selected_slot] && slots[selected_slot]['slots'].length">
<label>{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
<div class="control-group-container">
<div class="form-group slots" :class="[errors.has('booking[slot][from]') ? 'has-error' : '']">
@ -81,7 +81,7 @@
</div>
<div v-else>
<label>{{ __('bookingproduct::app.shop.products.select-date') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.select-date') }}</label>
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date_from]') ? 'has-error' : '']">

View File

@ -4,7 +4,7 @@
<script type="text/x-template" id="book-slots-template">
<div class="book-slots">
<label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }} :</label>
<label class="label-style required">{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }}</label>
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">

View File

@ -58,6 +58,6 @@
])
<div class="form-group">
<label>{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
<textarea name="booking[note]" class="form-style" style="width: 100%"/>
</div>

View File

@ -18,21 +18,11 @@ use Webkul\Product\Type\Virtual;
class Booking extends Virtual
{
/**
* BookingProductRepository instance
*
* @var \Webkul\BookingProduct\Repositories\BookingProductRepository
/** @var bool
*
* do not allow booking products to be copied, it would be too complicated.
*
*/
protected $bookingProductRepository;
/**
* Booking helper instance
*
* @var \Webkul\BookingProduct\Helpers\Booking
*/
protected $bookingHelper;
/** @var bool do not allow booking products to be copied, it would be too complicated. */
protected $canBeCopied = false;
/**
@ -66,9 +56,9 @@ class Booking extends Virtual
ProductAttributeValueRepository $attributeValueRepository,
ProductInventoryRepository $productInventoryRepository,
ProductImageRepository $productImageRepository,
BookingProductRepository $bookingProductRepository,
BookingHelper $bookingHelper,
ProductVideoRepository $productVideoRepository
ProductVideoRepository $productVideoRepository,
protected BookingProductRepository $bookingProductRepository,
protected BookingHelper $bookingHelper
)
{
parent::__construct(
@ -79,10 +69,6 @@ class Booking extends Virtual
$productImageRepository,
$productVideoRepository
);
$this->bookingProductRepository = $bookingProductRepository;
$this->bookingHelper = $bookingHelper;
}
/**

View File

@ -15,23 +15,14 @@ class PageController extends Controller
*/
protected $_config;
/**
* To hold the CMS repository instance.
*
* @var \Webkul\CMS\Repositories\CmsRepository
*/
protected $cmsRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\CMS\Repositories\CmsRepository $cmsRepository
* @return void
*/
public function __construct(CmsRepository $cmsRepository)
public function __construct(protected CmsRepository $cmsRepository)
{
$this->cmsRepository = $cmsRepository;
$this->_config = request('_config');
}

View File

@ -7,22 +7,14 @@ use Webkul\CMS\Repositories\CmsRepository;
class PagePresenterController extends Controller
{
/**
* CmsRepository object
*
* @var \Webkul\CMS\Repositories\CmsRepository
*/
protected $cmsRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\CMS\Repositories\CmsRepository $cmsRepository
* @return void
*/
public function __construct(CmsRepository $cmsRepository)
public function __construct(protected CmsRepository $cmsRepository)
{
$this->cmsRepository = $cmsRepository;
}
/**

View File

@ -15,48 +15,6 @@ use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository;
class CartRule
{
/**
* CartRuleRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleRepository
*/
protected $cartRuleRepository;
/**
* CartRuleCouponRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleCouponRepository
*/
protected $cartRuleCouponRepository;
/**
* CartRuleCouponUsageRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleCouponUsageRepository
*/
protected $cartRuleCouponUsageRepository;
/**
* CartRuleCustomerRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleCustomerRepository
*/
protected $cartRuleCustomerRepository;
/**
* CustomerGroupRepository object
*
* @var \Webkul\Customer\Repositories\CustomerGroupRepository
*/
protected $customerGroupRepository;
/**
* Validator object
*
* @var \Webkul\Rule\Helpers\Validator
*/
protected $validator;
/**
* @var array
*/
@ -75,25 +33,14 @@ class CartRule
* @return void
*/
public function __construct(
CartRuleRepository $cartRuleRepository,
CartRuleCouponRepository $cartRuleCouponRepository,
CartRuleCouponUsageRepository $cartRuleCouponUsageRepository,
CartRuleCustomerRepository $cartRuleCustomerRepository,
CustomerGroupRepository $customerGroupRepository,
Validator $validator
protected CartRuleRepository $cartRuleRepository,
protected CartRuleCouponRepository $cartRuleCouponRepository,
protected CartRuleCouponUsageRepository $cartRuleCouponUsageRepository,
protected CartRuleCustomerRepository $cartRuleCustomerRepository,
protected CustomerGroupRepository $customerGroupRepository,
protected Validator $validator
)
{
$this->cartRuleRepository = $cartRuleRepository;
$this->cartRuleCouponRepository = $cartRuleCouponRepository;
$this->cartRuleCouponUsageRepository = $cartRuleCouponUsageRepository;
$this->cartRuleCustomerRepository = $cartRuleCustomerRepository;
$this->customerGroupRepository = $customerGroupRepository;
$this->validator = $validator;
}
/**

View File

@ -18,25 +18,15 @@ class CartRuleController extends Controller
*/
protected $_config;
/**
* To hold cart repository instance.
*
* @var \Webkul\CartRule\Repositories\CartRuleRepository
*/
protected $cartRuleRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\CartRule\Repositories\CartRuleRepository $cartRuleRepository
* @param \Webkul\CartRule\Repositories\CartRuleRepository $cartRuleRepository
* @return void
*/
public function __construct(
CartRuleRepository $cartRuleRepository
) {
public function __construct(protected CartRuleRepository $cartRuleRepository)
{
$this->_config = request('_config');
$this->cartRuleRepository = $cartRuleRepository;
}
/**

View File

@ -7,22 +7,14 @@ use Webkul\CartRule\Repositories\CartRuleCouponRepository;
class CartRuleCouponController extends Controller
{
/**
* To hold cart rule coupon repository instance.
*
* @var \Webkul\CartRule\Repositories\CartRuleCouponRepository
*/
protected $cartRuleCouponRepository;
/**
* Create a new controller instance.
*
* @param \Webkul\CartRule\Repositories\CartRuleCouponRepository $cartRuleCouponRepository
* @return void
*/
public function __construct(CartRuleCouponRepository $cartRuleCouponRepository)
public function __construct(protected CartRuleCouponRepository $cartRuleCouponRepository)
{
$this->cartRuleCouponRepository = $cartRuleCouponRepository;
}
/**

View File

@ -6,22 +6,14 @@ use Webkul\CartRule\Helpers\CartRule;
class Cart
{
/**
* CartRule object
*
* @var \Webkul\CartRule\Helpers\CartRule
*/
protected $cartRuleHepler;
/**
* Create a new listener instance.
*
* @param \Webkul\CartRule\Repositories\CartRule $cartRuleHepler
* @return void
*/
public function __construct(CartRule $cartRuleHepler)
public function __construct(protected CartRule $cartRuleHepler)
{
$this->cartRuleHepler = $cartRuleHepler;
}
/**

View File

@ -9,34 +9,6 @@ use Webkul\CartRule\Repositories\CartRuleCouponUsageRepository;
class Order
{
/**
* CartRuleRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleRepository
*/
protected $cartRuleRepository;
/**
* CartRuleCustomerRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleCustomerRepository
*/
protected $cartRuleCustomerRepository;
/**
* CartRuleCouponRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleCouponRepository
*/
protected $cartRuleCouponRepository;
/**
* CartRuleCouponUsageRepository object
*
* @var \Webkul\CartRule\Repositories\CartRuleCouponUsageRepository
*/
protected $cartRuleCouponUsageRepository;
/**
* Create a new listener instance.
*
@ -47,19 +19,12 @@ class Order
* @return void
*/
public function __construct(
CartRuleRepository $cartRuleRepository,
CartRuleCustomerRepository $cartRuleCustomerRepository,
CartRuleCouponRepository $cartRuleCouponRepository,
CartRuleCouponUsageRepository $cartRuleCouponUsageRepository
protected CartRuleRepository $cartRuleRepository,
protected CartRuleCustomerRepository $cartRuleCustomerRepository,
protected CartRuleCouponRepository $cartRuleCouponRepository,
protected CartRuleCouponUsageRepository $cartRuleCouponUsageRepository
)
{
$this->cartRuleRepository = $cartRuleRepository;
$this->cartRuleCustomerRepository = $cartRuleCustomerRepository;
$this->cartRuleCouponRepository = $cartRuleCouponRepository;
$this->cartRuleCouponUsageRepository = $cartRuleCouponUsageRepository;
}
/**

View File

@ -14,55 +14,6 @@ use Webkul\Tax\Repositories\TaxCategoryRepository;
class CartRuleRepository extends Repository
{
/**
* Attribute family repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeFamilyRepository
*/
protected $attributeFamilyRepository;
/**
* Attribute repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* Category repository instance.
*
* @var \Webkul\Category\Repositories\CategoryRepository
*/
protected $categoryRepository;
/**
* Cart rule coupon repository instance.
*
* @var \Webkul\CartRule\Repositories\CartRuleCouponRepository
*/
protected $cartRuleCouponRepository;
/**
* Tax category repository instance.
*
* @var \Webkul\Tax\Repositories\TaxCategoryRepository
*/
protected $taxCategoryRepository;
/**
* Country repository instance.
*
* @var \Webkul\Core\Repositories\CountryRepository
*/
protected $countryRepository;
/**
* Country state repository instance.
*
* @var \Webkul\Core\Repositories\CountryStateRepository
*/
protected $countryStateRepository;
/**
* Create a new repository instance.
*
@ -77,29 +28,16 @@ class CartRuleRepository extends Repository
* @return void
*/
public function __construct(
AttributeFamilyRepository $attributeFamilyRepository,
AttributeRepository $attributeRepository,
CategoryRepository $categoryRepository,
CartRuleCouponRepository $cartRuleCouponRepository,
TaxCategoryRepository $taxCategoryRepository,
CountryRepository $countryRepository,
CountryStateRepository $countryStateRepository,
protected AttributeFamilyRepository $attributeFamilyRepository,
protected AttributeRepository $attributeRepository,
protected CategoryRepository $categoryRepository,
protected CartRuleCouponRepository $cartRuleCouponRepository,
protected TaxCategoryRepository $taxCategoryRepository,
protected CountryRepository $countryRepository,
protected CountryStateRepository $countryStateRepository,
App $app
) {
$this->attributeFamilyRepository = $attributeFamilyRepository;
$this->attributeRepository = $attributeRepository;
$this->categoryRepository = $categoryRepository;
$this->cartRuleCouponRepository = $cartRuleCouponRepository;
$this->taxCategoryRepository = $taxCategoryRepository;
$this->countryRepository = $countryRepository;
$this->countryStateRepository = $countryStateRepository;
)
{
parent::__construct($app);
}

View File

@ -21,23 +21,14 @@ class PriceRuleIndex extends Command
*/
protected $description = 'Automatically updates catalog rule price index information (eg. rule_price)';
/**
* CatalogRuleIndex object
*
* @var \Webkul\CatalogRule\Helpers\CatalogRuleIndex
*/
protected $catalogRuleIndexHelper;
/**
* Create a new command instance.
*
* @param \Webkul\CatalogRuleProduct\Helpers\CatalogRuleIndex $catalogRuleIndexHelper
* @return void
*/
public function __construct(CatalogRuleIndex $catalogRuleIndexHelper)
public function __construct(protected CatalogRuleIndex $catalogRuleIndexHelper)
{
$this->catalogRuleIndexHelper = $catalogRuleIndexHelper;
parent::__construct();
}

View File

@ -7,27 +7,6 @@ use Webkul\CatalogRule\Repositories\CatalogRuleRepository;
class CatalogRuleIndex
{
/**
* CatalogRuleRepository object
*
* @var \Webkul\CatalogRule\Repositories\CatalogRuleRepository
*/
protected $catalogRuleRepository;
/**
* CatalogRuleProduct object
*
* @var \Webkul\CatalogRule\Helpers\CatalogRuleProduct
*/
protected $catalogRuleHelper;
/**
* CatalogRuleProductPrice object
*
* @var \Webkul\CatalogRule\Helpers\CatalogRuleProductPrice
*/
protected $catalogRuleProductPriceHelper;
/**
* Create a new helper instance.
*
@ -37,16 +16,11 @@ class CatalogRuleIndex
* @return void
*/
public function __construct(
CatalogRuleRepository $catalogRuleRepository,
CatalogRuleProduct $catalogRuleProductHelper,
CatalogRuleProductPrice $catalogRuleProductPriceHelper
protected CatalogRuleRepository $catalogRuleRepository,
protected CatalogRuleProduct $catalogRuleProductHelper,
protected CatalogRuleProductPrice $catalogRuleProductPriceHelper
)
{
$this->catalogRuleRepository = $catalogRuleRepository;
$this->catalogRuleProductHelper = $catalogRuleProductHelper;
$this->catalogRuleProductPriceHelper = $catalogRuleProductPriceHelper;
}
/**

View File

@ -11,34 +11,6 @@ use Webkul\Rule\Helpers\Validator;
class CatalogRuleProduct
{
/**
* AttributeRepository object
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* ProductRepository object
*
* @var \Webkul\Product\Repositories\ProductRepository
*/
protected $productRepository;
/**
* CatalogRuleProductRepository object
*
* @var \Webkul\CatalogRule\Repositories\CatalogRuleProductRepository
*/
protected $catalogRuleProductRepository;
/**
* Validator object
*
* @var \Webkul\Rule\Helpers\ValidatorValidator
*/
protected $validator;
/**
* Create a new helper instance.
*
@ -49,19 +21,12 @@ class CatalogRuleProduct
* @return void
*/
public function __construct(
AttributeRepository $attributeRepository,
ProductRepository $productRepository,
CatalogRuleProductRepository $catalogRuleProductRepository,
Validator $validator
protected AttributeRepository $attributeRepository,
protected ProductRepository $productRepository,
protected CatalogRuleProductRepository $catalogRuleProductRepository,
protected Validator $validator
)
{
$this->attributeRepository = $attributeRepository;
$this->productRepository = $productRepository;
$this->catalogRuleProductRepository = $catalogRuleProductRepository;
$this->validator = $validator;
}
/**

View File

@ -8,27 +8,6 @@ use Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository;
class CatalogRuleProductPrice
{
/**
* CatalogRuleProductPriceRepository object
*
* @var \Webkul\CatalogRule\Repositories\CatalogRuleProductPriceRepository
*/
protected $catalogRuleProductPriceRepository;
/**
* CatalogRuleProduct object
*
* @var \Webkul\CatalogRule\Helpers\CatalogRuleProduct
*/
protected $catalogRuleProductHelper;
/**
* CustomerGroupRepository object
*
* @var \Webkul\Customer\Repositories\CustomerGroupRepository
*/
protected $customerGroupRepository;
/**
* Create a new helper instance.
*
@ -38,16 +17,11 @@ class CatalogRuleProductPrice
* @return void
*/
public function __construct(
CatalogRuleProductPriceRepository $catalogRuleProductPriceRepository,
CatalogRuleProduct $catalogRuleProductHelper,
CustomerGroupRepository $customerGroupRepository
protected CatalogRuleProductPriceRepository $catalogRuleProductPriceRepository,
protected CatalogRuleProduct $catalogRuleProductHelper,
protected CustomerGroupRepository $customerGroupRepository
)
{
$this->catalogRuleProductPriceRepository = $catalogRuleProductPriceRepository;
$this->catalogRuleProductHelper = $catalogRuleProductHelper;
$this->customerGroupRepository = $customerGroupRepository;
}
/**

View File

@ -16,20 +16,6 @@ class CatalogRuleController extends Controller
*/
protected $_config;
/**
* To hold catalog repository instance.
*
* @var \Webkul\CatalogRule\Repositories\CatalogRuleRepository
*/
protected $catalogRuleRepository;
/**
* Catalog rule index.
*
* @var \Webkul\CatalogRule\Helpers\CatalogRuleIndex
*/
protected $catalogRuleIndexHelper;
/**
* Create a new controller instance.
*
@ -38,14 +24,11 @@ class CatalogRuleController extends Controller
* @return void
*/
public function __construct(
CatalogRuleRepository $catalogRuleRepository,
CatalogRuleIndex $catalogRuleIndexHelper
) {
protected CatalogRuleRepository $catalogRuleRepository,
protected CatalogRuleIndex $catalogRuleIndexHelper
)
{
$this->_config = request('_config');
$this->catalogRuleRepository = $catalogRuleRepository;
$this->catalogRuleIndexHelper = $catalogRuleIndexHelper;
}
/**

View File

@ -6,22 +6,14 @@ use Webkul\CatalogRule\Helpers\CatalogRuleIndex;
class Product
{
/**
* Product Repository Object
*
* @var \Webkul\CatalogRule\Helpers\CatalogRuleIndex
*/
protected $catalogRuleIndexHelper;
/**
* Create a new listener instance.
*
* @param \Webkul\CatalogRule\Helpers\CatalogRuleIndex $catalogRuleIndexHelper
* @return void
*/
public function __construct(CatalogRuleIndex $catalogRuleIndexHelper)
public function __construct(protected CatalogRuleIndex $catalogRuleIndexHelper)
{
$this->catalogRuleIndexHelper = $catalogRuleIndexHelper;
}
/**

View File

@ -12,34 +12,6 @@ use Webkul\Tax\Repositories\TaxCategoryRepository;
class CatalogRuleRepository extends Repository
{
/**
* Attribute family repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeFamilyRepository
*/
protected $attributeFamilyRepository;
/**
* Attribute repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* Category repository instance.
*
* @var \Webkul\Category\Repositories\CategoryRepository
*/
protected $categoryRepository;
/**
* Tax category repository instance.
*
* @var \Webkul\CaTaxtegory\Repositories\axCategoryRepository
*/
protected $taxCategoryRepository;
/**
* Create a new repository instance.
*
@ -51,20 +23,13 @@ class CatalogRuleRepository extends Repository
* @return void
*/
public function __construct(
AttributeFamilyRepository $attributeFamilyRepository,
AttributeRepository $attributeRepository,
CategoryRepository $categoryRepository,
TaxCategoryRepository $taxCategoryRepository,
protected AttributeFamilyRepository $attributeFamilyRepository,
protected AttributeRepository $attributeRepository,
protected CategoryRepository $categoryRepository,
protected TaxCategoryRepository $taxCategoryRepository,
App $app
) {
$this->attributeFamilyRepository = $attributeFamilyRepository;
$this->attributeRepository = $attributeRepository;
$this->categoryRepository = $categoryRepository;
$this->taxCategoryRepository = $taxCategoryRepository;
)
{
parent::__construct($app);
}

View File

@ -18,20 +18,6 @@ class CategoryController extends Controller
*/
protected $_config;
/**
* Category repository instance.
*
* @var \Webkul\Category\Repositories\CategoryRepository
*/
protected $categoryRepository;
/**
* Attribute repository instance.
*
* @var \Webkul\Attribute\Repositories\AttributeRepository
*/
protected $attributeRepository;
/**
* Create a new controller instance.
*
@ -40,13 +26,10 @@ class CategoryController extends Controller
* @return void
*/
public function __construct(
CategoryRepository $categoryRepository,
AttributeRepository $attributeRepository
) {
$this->categoryRepository = $categoryRepository;
$this->attributeRepository = $attributeRepository;
protected CategoryRepository $categoryRepository,
protected AttributeRepository $attributeRepository
)
{
$this->_config = request('_config');
}

View File

@ -25,55 +25,6 @@ class Cart
{
use CartCoupons, CartTools, CartValidators;
/**
* Cart repository instance.
*
* @var \Webkul\Checkout\Repositories\CartRepository
*/
protected $cartRepository;
/**
* Cart item repository instance.
*
* @var \Webkul\Checkout\Repositories\CartItemRepository
*/
protected $cartItemRepository;
/**
* Cart address repository instance.
*
* @var \Webkul\Checkout\Repositories\CartAddressRepository
*/
protected $cartAddressRepository;
/**
* Product repository instance.
*
* @var \Webkul\Product\Repositories\ProductRepository
*/
protected $productRepository;
/**
* Tax category repository instance.
*
* @var \Webkul\Tax\Repositories\TaxCategoryRepository
*/
protected $taxCategoryRepository;
/**
* Wishlist repository instance.
*
* @var \Webkul\Customer\Repositories\WishlistRepository
*/
protected $wishlistRepository;
/**
* Customer address repository instance.
*
* @var \Webkul\Customer\Repositories\CustomerAddressRepository
*/
protected $customerAddressRepository;
/**
* Create a new class instance.
*
@ -87,27 +38,15 @@ class Cart
* @return void
*/
public function __construct(
CartRepository $cartRepository,
CartItemRepository $cartItemRepository,
CartAddressRepository $cartAddressRepository,
ProductRepository $productRepository,
TaxCategoryRepository $taxCategoryRepository,
WishlistRepository $wishlistRepository,
CustomerAddressRepository $customerAddressRepository
) {
$this->cartRepository = $cartRepository;
$this->cartItemRepository = $cartItemRepository;
$this->cartAddressRepository = $cartAddressRepository;
$this->productRepository = $productRepository;
$this->taxCategoryRepository = $taxCategoryRepository;
$this->wishlistRepository = $wishlistRepository;
$this->customerAddressRepository = $customerAddressRepository;
protected CartRepository $cartRepository,
protected CartItemRepository $cartItemRepository,
protected CartAddressRepository $cartAddressRepository,
protected ProductRepository $productRepository,
protected TaxCategoryRepository $taxCategoryRepository,
protected WishlistRepository $wishlistRepository,
protected CustomerAddressRepository $customerAddressRepository
)
{
}
/**

View File

@ -38,6 +38,7 @@ return [
\Webkul\Ui\Providers\ModuleServiceProvider::class,
\Webkul\User\Providers\ModuleServiceProvider::class,
\Webkul\Velocity\Providers\ModuleServiceProvider::class,
\Webkul\Sitemap\Providers\ModuleServiceProvider::class,
],
];

View File

@ -23,62 +23,6 @@ class Core
*/
const BAGISTO_VERSION = '1.x-dev';
/**
* Channel repository instance.
*
* @var \Webkul\Core\Repositories\ChannelRepository
*/
protected $channelRepository;
/**
* Currency repository instance.
*
* @var \Webkul\Core\Repositories\CurrencyRepository
*/
protected $currencyRepository;
/**
* Exchange rate repository instance.
*
* @var \Webkul\Core\Repositories\ExchangeRateRepository
*/
protected $exchangeRateRepository;
/**
* Country repository instance.
*
* @var \Webkul\Core\Repositories\CountryRepository
*/
protected $countryRepository;
/**
* Country state repository instance.
*
* @var \Webkul\Core\Repositories\CountryStateRepository
*/
protected $countryStateRepository;
/**
* Locale repository instance.
*
* @var \Webkul\Core\Repositories\LocaleRepository
*/
protected $localeRepository;
/**
* Customer group repository instance.
*
* @var CustomerGroupRepository
*/
protected $customerGroupRepository;
/**
* Core config repository instance.
*
* @var \Webkul\Core\Repositories\CoreConfigRepository
*/
protected $coreConfigRepository;
/**
* Channel.
*
@ -105,41 +49,27 @@ class Core
/**
* Create a new instance.
*
* @param \Webkul\Core\Repositories\ChannelRepository $channelRepository
* @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository
* @param \Webkul\Core\Repositories\ExchangeRateRepository $exchangeRateRepository
* @param \Webkul\Core\Repositories\CountryRepository $countryRepository
* @param \Webkul\Core\Repositories\CountryStateRepository $countryStateRepository
* @param \Webkul\Core\Repositories\LocaleRepository $localeRepository
* @param \Webkul\Core\Repositories\ChannelRepository $channelRepository
* @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository
* @param \Webkul\Core\Repositories\ExchangeRateRepository $exchangeRateRepository
* @param \Webkul\Core\Repositories\CountryRepository $countryRepository
* @param \Webkul\Core\Repositories\CountryStateRepository $countryStateRepository
* @param \Webkul\Core\Repositories\LocaleRepository $localeRepository
* @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository
* @param \Webkul\Core\Repositories\CoreConfigRepository $coreConfigRepository
* @param \Webkul\Core\Repositories\CoreConfigRepository $coreConfigRepository
* @return void
*/
public function __construct(
ChannelRepository $channelRepository,
CurrencyRepository $currencyRepository,
ExchangeRateRepository $exchangeRateRepository,
CountryRepository $countryRepository,
CountryStateRepository $countryStateRepository,
LocaleRepository $localeRepository,
CustomerGroupRepository $customerGroupRepository,
CoreConfigRepository $coreConfigRepository
) {
$this->channelRepository = $channelRepository;
$this->currencyRepository = $currencyRepository;
$this->exchangeRateRepository = $exchangeRateRepository;
$this->countryRepository = $countryRepository;
$this->countryStateRepository = $countryStateRepository;
$this->localeRepository = $localeRepository;
$this->customerGroupRepository = $customerGroupRepository;
$this->coreConfigRepository = $coreConfigRepository;
protected ChannelRepository $channelRepository,
protected CurrencyRepository $currencyRepository,
protected ExchangeRateRepository $exchangeRateRepository,
protected CountryRepository $countryRepository,
protected CountryStateRepository $countryStateRepository,
protected LocaleRepository $localeRepository,
protected CustomerGroupRepository $customerGroupRepository,
protected CoreConfigRepository $coreConfigRepository
)
{
}
/**

View File

@ -22,36 +22,18 @@ class ExchangeRates extends ExchangeRate
*/
protected $apiEndPoint;
/**
* CurrencyRepository $currencyRepository
*
* @var \Webkul\Core\Repositories\CurrencyRepository
*/
protected $currencyRepository;
/**
* ExchangeRateRepository $exchangeRateRepository
*
* @var \Webkul\Core\Repositories\ExchangeRateRepository
*/
protected $exchangeRateRepository;
/**
* Create a new helper instance.
*
* @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository
* @param \Webkul\Core\Repositories\CurrencyRepository $currencyRepository
* @param \Webkul\Core\Repositories\ExchangeRateRepository $exchangeRateRepository
* @return void
*/
public function __construct(
CurrencyRepository $currencyRepository,
ExchangeRateRepository $exchangeRateRepository
protected CurrencyRepository $currencyRepository,
protected ExchangeRateRepository $exchangeRateRepository
)
{
$this->currencyRepository = $currencyRepository;
$this->exchangeRateRepository = $exchangeRateRepository;
$this->apiEndPoint = 'https://api.exchangeratesapi.io/latest';
$this->apiKey = config('services.exchange-api.exchange_rates.key');

Some files were not shown because too many files have changed in this diff Show More