Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
This commit is contained in:
commit
791813ed55
|
|
@ -57,6 +57,14 @@ class CMSPageDataGrid extends DataGrid
|
|||
|
||||
public function prepareActions()
|
||||
{
|
||||
$this->addAction([
|
||||
'title' => trans('admin::app.datagrid.view'),
|
||||
'method' => 'GET',
|
||||
'route' => 'shop.cms.page',
|
||||
'index' => 'url_key',
|
||||
'icon' => 'icon eye-icon',
|
||||
]);
|
||||
|
||||
$this->addAction([
|
||||
'title' => trans('admin::app.datagrid.edit'),
|
||||
'method' => 'GET',
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class OrderTransactionsDataGrid extends DataGrid
|
|||
{
|
||||
$queryBuilder = DB::table('order_transactions')
|
||||
->leftJoin('orders as ors', 'order_transactions.order_id', '=', 'ors.id')
|
||||
->select('order_transactions.id as id', 'order_transactions.transaction_id as transaction_id', 'order_transactions.invoice_id as invoice_id', 'ors.increment_id as order_id', 'order_transactions.created_at as created_at');
|
||||
->select('order_transactions.id as id', 'order_transactions.transaction_id as transaction_id', 'order_transactions.invoice_id as invoice_id', 'ors.increment_id as order_id', 'order_transactions.created_at as created_at', 'order_transactions.amount as amount', 'order_transactions.status as status');
|
||||
|
||||
$this->addFilter('id', 'order_transactions.id');
|
||||
$this->addFilter('transaction_id', 'order_transactions.transaction_id');
|
||||
|
|
@ -34,7 +34,7 @@ class OrderTransactionsDataGrid extends DataGrid
|
|||
'type' => 'number',
|
||||
'searchable' => false,
|
||||
'sortable' => true,
|
||||
'filterable' => true,
|
||||
'filterable' => false,
|
||||
]);
|
||||
|
||||
$this->addColumn([
|
||||
|
|
@ -46,6 +46,24 @@ class OrderTransactionsDataGrid extends DataGrid
|
|||
'filterable' => true,
|
||||
]);
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'created_at',
|
||||
'label' => trans('admin::app.datagrid.transaction-date'),
|
||||
'type' => 'datetime',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'filterable' => true,
|
||||
]);
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'amount',
|
||||
'label' => trans('admin::app.sales.transactions.transaction-amount'),
|
||||
'type' => 'price',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'filterable' => true,
|
||||
]);
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'invoice_id',
|
||||
'label' => trans('admin::app.datagrid.invoice-id'),
|
||||
|
|
@ -55,6 +73,7 @@ class OrderTransactionsDataGrid extends DataGrid
|
|||
'filterable' => true,
|
||||
]);
|
||||
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'order_id',
|
||||
'label' => trans('admin::app.datagrid.order-id'),
|
||||
|
|
@ -65,9 +84,9 @@ class OrderTransactionsDataGrid extends DataGrid
|
|||
]);
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'created_at',
|
||||
'label' => trans('admin::app.datagrid.transaction-date'),
|
||||
'type' => 'datetime',
|
||||
'index' => 'status',
|
||||
'label' => trans('admin::app.datagrid.status'),
|
||||
'type' => 'string',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'filterable' => true,
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ use Webkul\Payment\Facades\Payment;
|
|||
use Webkul\Sales\Repositories\InvoiceRepository;
|
||||
use Webkul\Sales\Repositories\OrderRepository;
|
||||
use Webkul\Sales\Repositories\OrderTransactionRepository;
|
||||
use Webkul\Sales\Repositories\ShipmentRepository;
|
||||
|
||||
class TransactionController extends Controller
|
||||
{
|
||||
|
|
@ -25,12 +26,14 @@ class TransactionController extends Controller
|
|||
* @param \Webkul\Sales\Repositories\OrderRepository $orderRepository
|
||||
* @param \Webkul\Sales\Repositories\OrderTransactionRepository $orderTransactionRepository
|
||||
* @param \Webkul\Sales\Repositories\InvoiceRepository $invoiceRepository
|
||||
* @param \Webkul\Sales\Repositories\ShipmentRepository $shipmentRepository
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(
|
||||
protected OrderRepository $orderRepository,
|
||||
protected OrderTransactionRepository $orderTransactionRepository,
|
||||
protected InvoiceRepository $invoiceRepository
|
||||
protected InvoiceRepository $invoiceRepository,
|
||||
protected ShipmentRepository $shipmentRepository
|
||||
)
|
||||
{
|
||||
$this->_config = request('_config');
|
||||
|
|
@ -84,40 +87,46 @@ class TransactionController extends Controller
|
|||
return redirect(route('admin.sales.transactions.index'));
|
||||
}
|
||||
|
||||
$order = $this->orderRepository->find($invoice->order_id);
|
||||
if ($request->amount > $invoice->base_grand_total) {
|
||||
session()->flash('info', trans('admin::app.sales.transactions.response.transaction-amount-exceeds'));
|
||||
|
||||
$randomId = random_bytes(20);
|
||||
return redirect(route('admin.sales.transactions.create'));
|
||||
} else {
|
||||
$order = $this->orderRepository->find($invoice->order_id);
|
||||
|
||||
$this->orderTransactionRepository->create([
|
||||
'transaction_id' => bin2hex($randomId),
|
||||
'type' => $request->payment_method,
|
||||
'payment_method' => $request->payment_method,
|
||||
'invoice_id' => $invoice->id,
|
||||
'order_id' => $invoice->order_id,
|
||||
'amount' => $request->amount,
|
||||
'status' => 'paid',
|
||||
'data' => json_encode([
|
||||
'paidAmount' => $request->amount,
|
||||
]),
|
||||
]);
|
||||
$randomId = random_bytes(20);
|
||||
|
||||
$transactionTotal = $this->orderTransactionRepository->where('invoice_id', $invoice->id)->sum('amount');
|
||||
$this->orderTransactionRepository->create([
|
||||
'transaction_id' => bin2hex($randomId),
|
||||
'type' => $request->payment_method,
|
||||
'payment_method' => $request->payment_method,
|
||||
'invoice_id' => $invoice->id,
|
||||
'order_id' => $invoice->order_id,
|
||||
'amount' => $request->amount,
|
||||
'status' => 'paid',
|
||||
'data' => json_encode([
|
||||
'paidAmount' => $request->amount,
|
||||
]),
|
||||
]);
|
||||
|
||||
if ($transactionTotal >= $invoice->base_grand_total) {
|
||||
$shipments = $this->shipmentRepository->where('order_id', $invoice->order_id)->first();
|
||||
$transactionTotal = $this->orderTransactionRepository->where('invoice_id', $invoice->id)->sum('amount');
|
||||
|
||||
if (isset($shipments)) {
|
||||
$this->orderRepository->updateOrderStatus($order, 'completed');
|
||||
} else {
|
||||
$this->orderRepository->updateOrderStatus($order, 'processing');
|
||||
if ($transactionTotal >= $invoice->base_grand_total) {
|
||||
$shipments = $this->shipmentRepository->where('order_id', $invoice->order_id)->first();
|
||||
|
||||
if (isset($shipments)) {
|
||||
$this->orderRepository->updateOrderStatus($order, 'completed');
|
||||
} else {
|
||||
$this->orderRepository->updateOrderStatus($order, 'processing');
|
||||
}
|
||||
|
||||
$this->invoiceRepository->updateState($invoice, 'paid');
|
||||
}
|
||||
|
||||
$this->invoiceRepository->updateState($invoice, 'paid');
|
||||
session()->flash('success', trans('admin::app.sales.transactions.response.transaction-saved'));
|
||||
|
||||
return redirect(route('admin.sales.transactions.index'));
|
||||
}
|
||||
|
||||
session()->flash('success', trans('admin::app.sales.transactions.response.transaction-saved'));
|
||||
|
||||
return redirect(route('admin.sales.transactions.index'));
|
||||
}
|
||||
|
||||
session()->flash('error', trans('admin::app.sales.transactions.response.invoice-missing'));
|
||||
|
|
|
|||
|
|
@ -522,6 +522,7 @@ return [
|
|||
'invoice-missing' => 'معرف الفاتورة هذا غير موجود',
|
||||
'transaction-saved' => 'تم حفظ الصفقة',
|
||||
'already-paid' => 'تم دفع هذه الفاتورة بالفعل',
|
||||
'transaction-amount-exceeds' => 'المبلغ المحدد لهذه المعاملة أكبر من المبلغ الإجمالي للفاتورة.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -497,24 +497,25 @@ return [
|
|||
],
|
||||
|
||||
'transactions' => [
|
||||
'title' => 'Transactions',
|
||||
'create-title' => 'Add transaction',
|
||||
'title' => 'Transaktionen',
|
||||
'create-title' => 'Transaktion hinzufügen',
|
||||
'id' => 'Id',
|
||||
'transaction-id' => 'Transaction Id',
|
||||
'payment-method' => 'Payment method',
|
||||
'transaction-amount' => 'Transaction amount',
|
||||
'action' => 'Action',
|
||||
'view-title' => 'Transaction #:transaction_id',
|
||||
'transaction-data' => 'Transaction Data',
|
||||
'order-id' => 'Order Id',
|
||||
'invoice-id' => 'Invoice Id',
|
||||
'transaction-id' => 'Transaktions-ID',
|
||||
'payment-method' => 'Bezahlverfahren',
|
||||
'transaction-amount' => 'Transaktionshöhe',
|
||||
'action' => 'Handlung',
|
||||
'view-title' => 'Transaktion #:transaction_id',
|
||||
'transaction-data' => 'Transaktionsdaten',
|
||||
'order-id' => 'Auftragsnummer',
|
||||
'invoice-id' => 'Rechnungs-ID',
|
||||
'status' => 'Status',
|
||||
'created-at' => 'Created At',
|
||||
'transaction-details' => 'Transaction Details',
|
||||
'created-at' => 'Hergestellt in',
|
||||
'transaction-details' => 'Transaktionsdetails',
|
||||
'response' => [
|
||||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'invoice-missing' => 'Diese Rechnungs-ID existiert nicht',
|
||||
'transaction-saved' => 'Die Transaktion wurde gespeichert',
|
||||
'already-paid' => 'Diese Rechnung wurde bereits bezahlt',
|
||||
'transaction-amount-exceeds' => 'Der angegebene Betrag dieser Transaktion übersteigt den Gesamtbetrag der Rechnung.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -1671,6 +1672,7 @@ return [
|
|||
'canceled' => 'Order Canceled',
|
||||
'pending' => 'Order Pending',
|
||||
'processing' => 'Order Processing',
|
||||
'pending payment' => 'Pending Payment',
|
||||
],
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -523,6 +523,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -520,6 +520,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -524,6 +524,7 @@ return [
|
|||
'invoice-missing' => 'Cet identifiant de facture n\'existe pas',
|
||||
'transaction-saved' => 'La transaction a été enregistrée',
|
||||
'already-paid' => 'Cette facture a déjà été payée',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -522,6 +522,7 @@ return [
|
|||
'invoice-missing' => 'यह चालान आईडी मौजूद नहीं है',
|
||||
'transaction-saved' => 'लेन-देन सहेजा गया है',
|
||||
'already-paid' => 'इस चालान का भुगतान पहले ही किया जा चुका है',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -520,6 +520,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ return [
|
|||
'invoice-missing' => 'Dit factuurnummer bestaat niet',
|
||||
'transaction-saved' => 'De transactie is geregistreerd',
|
||||
'already-paid' => 'Dit factuur is al voldaan',
|
||||
'transaction-amount-exceeds' => 'Het opgegeven bedrag van deze transactie overschrijdt het totaalbedrag van de factuur.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -515,6 +515,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -525,6 +525,7 @@ return [
|
|||
'invoice-missing' => 'This invoice id does not exist',
|
||||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ return [
|
|||
'invoice-missing' => 'Bu fatura kimliği mevcut değil',
|
||||
'transaction-saved' => 'İşlem kaydedildi',
|
||||
'already-paid' => 'Bu fatura zaten ödendi',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ return [
|
|||
'invoice-missing' => '此发票ID不存在',
|
||||
'transaction-saved' => '交易已保存',
|
||||
'already-paid' => '此发票已支付',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/shop.js": "/js/shop.js?id=34684ef2b5b3c24817b4",
|
||||
"/css/shop.css": "/css/shop.css?id=018e0f910649f28ef1f0"
|
||||
"/css/shop.css": "/css/shop.css?id=a7c7bfc61859923d2d79"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4133,6 +4133,20 @@ ol.breadcrumb {
|
|||
}
|
||||
}
|
||||
|
||||
.account-content {
|
||||
.account-layout {
|
||||
.control-group {
|
||||
&.date,
|
||||
&.datetime {
|
||||
&::after {
|
||||
position: relative;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Header css start here.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -570,6 +570,14 @@ return [
|
|||
'payment-methods' => 'اختار طريقة الدفع',
|
||||
'payment-method' => 'طريقة الدفع او السداد',
|
||||
'payment-method' => 'طريقة الدفع',
|
||||
'payment-method-name' => [
|
||||
'PayPal Smart Button' => 'زر PayPal الذكي',
|
||||
'PayPal' => 'باي بال ',
|
||||
'Cash On Delivery' => 'الدفع عند الاستلام',
|
||||
'Money Transfer' => 'حوالة مالية',
|
||||
'PayPal Standard' => 'معيار PayPal'
|
||||
|
||||
],
|
||||
'summary' => 'المعلومات',
|
||||
'price' => 'السعر',
|
||||
'quantity' => 'الكمية',
|
||||
|
|
|
|||
|
|
@ -569,6 +569,13 @@ return [
|
|||
'shipping-method' => 'Select Shipping Method',
|
||||
'payment-methods' => 'Select Payment Method',
|
||||
'payment-method' => 'Payment Method',
|
||||
'payment-method-name' => [
|
||||
'PayPal Smart Button' => 'PayPal Smart Button',
|
||||
'PayPal' => 'PayPal',
|
||||
'Cash On Delivery' => 'Cash On Delivery',
|
||||
'Money Transfer' => 'Money Transfer',
|
||||
'Paypal Standard' => 'PayPal Standard'
|
||||
],
|
||||
'summary' => 'Order Summary',
|
||||
'price' => 'Price',
|
||||
'quantity' => 'Quantity',
|
||||
|
|
|
|||
|
|
@ -568,6 +568,14 @@ return [
|
|||
'shipping-method' => 'जलयात्रा पद्धति का चयन करें',
|
||||
'payment-methods' => 'भुगतान का तरीका चुनें',
|
||||
'payment-method' => 'भुगतान विधि',
|
||||
'payment-method-name' => [
|
||||
'PayPal Smart Button' => 'पेपाल स्मार्ट बटन',
|
||||
'PayPal' => 'पेपाल',
|
||||
'Cash On Delivery' => 'डिलवरी पर नकदी',
|
||||
'Money Transfer' => 'मनी ट्रांसफर',
|
||||
'PayPal Standard' => 'पेपैल मानक'
|
||||
|
||||
],
|
||||
'summary' => 'आदेश सारांश',
|
||||
'price' => 'कीमत',
|
||||
'quantity' => 'मात्रा',
|
||||
|
|
|
|||
|
|
@ -559,6 +559,13 @@ return [
|
|||
'shipping-method' => 'Selecione o Método de Entrega',
|
||||
'payment-methods' => 'Selecione o Método de Pagamento',
|
||||
'payment-method' => 'Método de Pagamento',
|
||||
'payment-method-name' => [
|
||||
'PayPal Smart Button' => 'Botão Inteligente do PayPal',
|
||||
'PayPal' => 'PayPal',
|
||||
'Cash On Delivery' => 'Dinheiro na entrega',
|
||||
'Money Transfer' => 'Transferência de dinheiro',
|
||||
'Paypal Standard' => 'Padrão do PayPal'
|
||||
],
|
||||
'summary' => 'Resumo do Pedido',
|
||||
'price' => 'Preço',
|
||||
'quantity' => 'Quantidade',
|
||||
|
|
|
|||
|
|
@ -57,10 +57,12 @@
|
|||
|
||||
{!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
|
||||
|
||||
<div class="control-group" :class="[errors.has('date_of_birth') ? 'has-error' : '']">
|
||||
<div class="control-group date" :class="[errors.has('date_of_birth') ? 'has-error' : '']">
|
||||
<label for="date_of_birth">{{ __('shop::app.customer.account.profile.dob') }}</label>
|
||||
|
||||
<input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as=""{{ __('shop::app.customer.account.profile.dob') }}"">
|
||||
<date>
|
||||
<input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as=""{{ __('shop::app.customer.account.profile.dob') }}"">
|
||||
</date>
|
||||
|
||||
<span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class VelocityMetaDataSeeder extends Seeder
|
|||
'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="{!! url(\'page/about-us\') !!}">About Us</a></li><li><a href="{!! url(\'page/cutomer-service\') !!}">Customer Service</a></li><li><a href="{!! url(\'page/whats-new\') !!}">What’s New</a></li><li><a href="{!! url(\'page/contact-us\') !!}">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="{!! url(\'page/return-policy\') !!}"> Order and Returns </a></li><li><a href="{!! url(\'page/payment-policy\') !!}"> Payment Policy </a></li><li><a href="{!! url(\'page/shipping-policy\') !!}"> Shipping Policy</a></li><li><a href="{!! url(\'page/privacy-policy\') !!}"> Privacy and Cookies Policy </a></li></ul></div>',
|
||||
'slider' => 1,
|
||||
|
||||
'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>',
|
||||
'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://facebook.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://twitter.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://linkedin.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://pintrest.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://youtube.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://instagram.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>',
|
||||
|
||||
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shipping on Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace & Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@ class ConfigurationController extends Controller
|
|||
'footer_left_content' => __('velocity::app.admin.meta-data.footer-left-raw-content'),
|
||||
'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="{!! url(\'page/about-us\') !!}">About Us</a></li><li><a href="{!! url(\'page/cutomer-service\') !!}">Customer Service</a></li><li><a href="{!! url(\'page/whats-new\') !!}">What’s New</a></li><li><a href="{!! url(\'page/contact-us\') !!}">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="{!! url(\'page/return-policy\') !!}"> Order and Returns </a></li><li><a href="{!! url(\'page/payment-policy\') !!}"> Payment Policy </a></li><li><a href="{!! url(\'page/shipping-policy\') !!}"> Shipping Policy</a></li><li><a href="{!! url(\'page/privacy-policy\') !!}"> Privacy and Cookies Policy </a></li></ul></div>',
|
||||
'slider' => 1,
|
||||
'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>',
|
||||
'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://facebook.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://twitter.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://linkedin.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://pintrest.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://youtube.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://instagram.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>',
|
||||
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shipping on Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace & Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
<div class="pl40">
|
||||
<div class="row">
|
||||
<span class="payment-method method-label">
|
||||
<b>{{ $payment['method_title'] }}</b>
|
||||
<b>{{ __('shop::app.checkout.onepage.payment-method-name.'.$payment['method_title']) }}</b>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<span class="method-summary">{{ __($payment['description']) }}</span>
|
||||
<span class="method-summary">{{ __('shop::app.checkout.onepage.payment-method-name.'.$payment['description']) }}</span>
|
||||
</div>
|
||||
|
||||
<?php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($payment['method']); ?>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,24 @@
|
|||
<div class="row footer-statics col-12 no-margin">
|
||||
@include('velocity::layouts.footer.footer-links.footer-left')
|
||||
@include('velocity::layouts.footer.footer-links.footer-middle')
|
||||
@include('velocity::layouts.footer.footer-links.footer-right')
|
||||
<div class="row footer-statics no-margin">
|
||||
<div class="col-12 software-description">
|
||||
<div class="logo">
|
||||
<a href="{{ route('shop.home.index') }}" aria-label="Logo">
|
||||
@if ($logo = core()->getCurrentChannel()->logo_url)
|
||||
<img
|
||||
src="{{ $logo }}"
|
||||
class="logo full-img" alt="" width="200" height="50" />
|
||||
@else
|
||||
<img
|
||||
src="{{ asset('themes/velocity/assets/images/static/logo-text-white.png') }}"
|
||||
class="logo full-img" alt="" width="200" height="50" />
|
||||
@endif
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@if ($velocityMetaData)
|
||||
{!! $velocityMetaData->footer_left_content !!}
|
||||
@else
|
||||
{!! __('velocity::app.admin.meta-data.footer-left-raw-content') !!}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
<div class="col-lg-4 col-md-12 col-sm-12 software-description">
|
||||
<div class="logo">
|
||||
<a href="{{ route('shop.home.index') }}" aria-label="Logo">
|
||||
@if ($logo = core()->getCurrentChannel()->logo_url)
|
||||
<img
|
||||
src="{{ $logo }}"
|
||||
class="logo full-img" alt="" width="200" height="50" />
|
||||
@else
|
||||
<img
|
||||
src="{{ asset('themes/velocity/assets/images/static/logo-text-white.png') }}"
|
||||
class="logo full-img" alt="" width="200" height="50" />
|
||||
@endif
|
||||
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@if ($velocityMetaData)
|
||||
{!! $velocityMetaData->footer_left_content !!}
|
||||
@else
|
||||
{!! __('velocity::app.admin.meta-data.footer-left-raw-content') !!}
|
||||
@endif
|
||||
</div>
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
<div class="col-lg-4 col-md-12 col-sm-12 footer-ct-content">
|
||||
<div class="row">
|
||||
|
||||
@if ($velocityMetaData)
|
||||
{!! DbView::make($velocityMetaData)->field('footer_middle_content')->render() !!}
|
||||
@else
|
||||
<div class="col-lg-6 col-md-12 col-sm-12 no-padding">
|
||||
<ul type="none">
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.about-us') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.customer-service') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.whats-new') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.contact-us') }}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-lg-6 col-md-12 col-sm-12 no-padding">
|
||||
<ul type="none">
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.order-and-returns') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.payment-policy') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.shipping-policy') }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://webkul.com/about-us/company-profile/">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle.privacy-and-cookies-policy') }}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
<div class="col-lg-4 col-md-12 col-sm-12 footer-rt-content">
|
||||
<div class="row">
|
||||
<div class="mb5 col-12">
|
||||
<h3>{{ __('velocity::app.home.payment-methods') }}</h3>
|
||||
</div>
|
||||
|
||||
<div class="payment-methods col-12">
|
||||
@foreach(\Webkul\Payment\Facades\Payment::getPaymentMethods() as $method)
|
||||
<div class="method-sticker">
|
||||
{{ $method['method_title'] }}
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="mb5 col-12">
|
||||
<h3>{{ __('velocity::app.home.shipping-methods') }}</h3>
|
||||
</div>
|
||||
|
||||
<div class="shipping-methods col-12">
|
||||
@foreach(\Webkul\Shipping\Facades\Shipping::getShippingMethods() as $method)
|
||||
<div class="method-sticker">
|
||||
{{ $method['method_title'] }}
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,17 +1,11 @@
|
|||
<div class="footer">
|
||||
<div class="footer-content">
|
||||
|
||||
@include('shop::layouts.footer.newsletter-subscription')
|
||||
@include('shop::layouts.footer.footer-links')
|
||||
|
||||
{{-- @if ($categories)
|
||||
@include('shop::layouts.footer.top-brands')
|
||||
@endif --}}
|
||||
@include('shop::layouts.footer.footer-links')
|
||||
|
||||
@if (core()->getConfigData('general.content.footer.footer_toggle'))
|
||||
@include('shop::layouts.footer.copy-right')
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue