Merge branch 'master' of https://github.com/bagisto/bagisto into development
This commit is contained in:
rahulshukla-home
commit
a500fa9074
|
|
@ -97,7 +97,7 @@ http(s)://example.com/public
|
|||
##### Execute these commands below, in order
|
||||
|
||||
~~~
|
||||
1. composer create-project bagisto/bagisto
|
||||
1. composer create-project bagisto/bagisto-standard
|
||||
~~~
|
||||
|
||||
~~~
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -82,6 +82,15 @@ class AddressDataGrid extends DataGrid
|
|||
'filterable' => true,
|
||||
]);
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'company_name',
|
||||
'label' => trans('admin::app.customers.addresses.company-name'),
|
||||
'type' => 'string',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
'filterable' => true,
|
||||
]);
|
||||
|
||||
$this->addColumn([
|
||||
'index' => 'address1',
|
||||
'label' => trans('admin::app.customers.addresses.address-1'),
|
||||
|
|
|
|||
|
|
@ -901,6 +901,7 @@ return [
|
|||
'address-list' => 'Address\'s List',
|
||||
'order-list' => 'Order\'s List',
|
||||
'address-id' => 'Address ID',
|
||||
'company-name' => 'Company Name',
|
||||
'address-1' => 'Address 1',
|
||||
'city' => 'City',
|
||||
'state-name' => 'State',
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{{ $address->name }}</br>
|
||||
{{ $address->company_name ?? '' }}</br>
|
||||
<b>{{ $address->name }}</b></br>
|
||||
{{ $address->address1 }}</br>
|
||||
{{ $address->city }}</br>
|
||||
{{ $address->state }}</br>
|
||||
{{ core()->country_name($address->country) }} {{ $address->postcode }}</br></br>
|
||||
{{ __('shop::app.checkout.onepage.contact') }} : {{ $address->phone }}
|
||||
{{ __('shop::app.checkout.onepage.contact') }} : {{ $address->phone }}
|
||||
|
|
@ -313,6 +313,7 @@ return [
|
|||
'individual-refund' => '#:refund_id مسترجع',
|
||||
'adjustment-refund' => 'تعديلات عملية الإسترجاع',
|
||||
'adjustment-fee' => 'تكلفة تعديلات عملية الإسترجاع',
|
||||
'cancel-confirm-msg' => 'هل أنت متأكد من أنك تريد إلغاء هذا الطلب ؟',
|
||||
'tracking-number' => 'Tracking Number',
|
||||
'cancel-confirm-msg' => 'هل أنت متأكد أنك تريد إلغاء هذا الطلب ?'
|
||||
]
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
</label>
|
||||
|
||||
<ul class="address-card-list" style="float: right; width: 85%;">
|
||||
<li class="mb-5" v-if="addresses.company-name != ''">
|
||||
@{{ addresses.company_name }}
|
||||
</li>
|
||||
|
||||
<li class="mb-10">
|
||||
<b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
|
||||
</li>
|
||||
|
|
@ -269,8 +273,12 @@
|
|||
</label>
|
||||
|
||||
<ul class="address-card-list" style="float: right; width: 85%;">
|
||||
<li class="mb-5" v-if="addresses.company-name != ''">
|
||||
@{{ addresses.company_name }}
|
||||
</li>
|
||||
|
||||
<li class="mb-10">
|
||||
<b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
|
||||
<b>@{{ addresses.first_name }} @{{ addresses.last_name }},</b>
|
||||
</li>
|
||||
|
||||
<li class="mb-5">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@
|
|||
<div class="card-content">
|
||||
<ul>
|
||||
<li class="mb-10">
|
||||
{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}
|
||||
{{ $billingAddress->company_name ?? '' }}
|
||||
</li>
|
||||
<li class="mb-10">
|
||||
<b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
|
||||
</li>
|
||||
<li class="mb-10">
|
||||
{{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
|
||||
|
|
@ -41,7 +44,10 @@
|
|||
<div class="card-content">
|
||||
<ul>
|
||||
<li class="mb-10">
|
||||
{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}
|
||||
{{ $shippingAddress->company_name ?? '' }}
|
||||
</li>
|
||||
<li class="mb-10">
|
||||
<b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
|
||||
</li>
|
||||
<li class="mb-10">
|
||||
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
var message = "Are your sure you want to perform this action ?";
|
||||
|
||||
if(binding.value && binding.value != '')
|
||||
if (binding.value && binding.value != '')
|
||||
message = binding.value;
|
||||
|
||||
if (confirm(message)) {
|
||||
|
|
|
|||
|
|
@ -76,10 +76,22 @@ class ComparisonController extends Controller
|
|||
|
||||
if (! $compareProduct) {
|
||||
// insert new row
|
||||
$this->compareProductsRepository->create([
|
||||
'customer_id' => $customerId,
|
||||
'product_flat_id' => $productId,
|
||||
]);
|
||||
|
||||
$productFlatRepository = app('\Webkul\Product\Models\ProductFlat');
|
||||
|
||||
$productFlat = $productFlatRepository
|
||||
->where('product_id', $productId)
|
||||
->get()
|
||||
->first();
|
||||
|
||||
if ($productFlat) {
|
||||
$productId = $productFlat->id;
|
||||
|
||||
$this->compareProductsRepository->create([
|
||||
'customer_id' => $customerId,
|
||||
'product_flat_id' => $productId,
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'status' => 'success',
|
||||
|
|
|
|||
|
|
@ -302,12 +302,6 @@ $(document).ready(function () {
|
|||
},
|
||||
|
||||
addFlashMessages: function () {
|
||||
// const flashes = this.$refs.flashes;
|
||||
|
||||
// flashMessages.forEach(function (flash) {
|
||||
// flashes.addFlash(flash);
|
||||
// }, this);
|
||||
|
||||
if (window.flashMessages.alertMessage)
|
||||
window.alert(window.flashMessages.alertMessage);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@
|
|||
</li>
|
||||
</ul>
|
||||
|
||||
<ul type="none" class="category-wrapper" v-if="$root.sharedRootCategories.length > 0">
|
||||
<li v-for="(category, index) in $root.sharedRootCategories">
|
||||
<ul type="none" class="category-wrapper" v-if="rootCategoriesCollection.length > 0">
|
||||
<li v-for="(category, index) in rootCategoriesCollection">
|
||||
<a class="unset" :href="`${$root.baseUrl}/${category.slug}`">
|
||||
<div class="category-logo">
|
||||
<img
|
||||
|
|
@ -390,6 +390,7 @@
|
|||
props: [
|
||||
'heading',
|
||||
'headerContent',
|
||||
'categoryCount',
|
||||
],
|
||||
|
||||
data: function () {
|
||||
|
|
@ -403,6 +404,7 @@
|
|||
'isSearchbar': false,
|
||||
'rootCategories': true,
|
||||
'cartItemsCount': '{{ $cartItemsCount }}',
|
||||
'rootCategoriesCollection': this.$root.sharedRootCategories,
|
||||
'isCustomer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
|
||||
}
|
||||
},
|
||||
|
|
@ -422,6 +424,10 @@
|
|||
|
||||
'$root.miniCartKey': function () {
|
||||
this.getMiniCartDetails();
|
||||
},
|
||||
|
||||
'$root.sharedRootCategories': function (categories) {
|
||||
this.formatCategories(categories);
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -511,6 +517,20 @@
|
|||
console.log(this.__('error.something_went_wrong'));
|
||||
});
|
||||
},
|
||||
|
||||
formatCategories: function (categories) {
|
||||
let slicedCategories = categories;
|
||||
let categoryCount = this.categoryCount ? this.categoryCount : 9;
|
||||
|
||||
if (
|
||||
slicedCategories
|
||||
&& slicedCategories.length > categoryCount
|
||||
) {
|
||||
slicedCategories = categories.slice(0, categoryCount);
|
||||
}
|
||||
|
||||
this.rootCategoriesCollection = slicedCategories;
|
||||
},
|
||||
},
|
||||
});
|
||||
})()
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@
|
|||
|
||||
<div class="cart-content col-12">
|
||||
<form
|
||||
action="{{ route('shop.checkout.cart.update') }}"
|
||||
method="POST"
|
||||
@submit.prevent="onSubmit">
|
||||
@submit.prevent="onSubmit"
|
||||
action="{{ route('shop.checkout.cart.update') }}">
|
||||
|
||||
<div class="cart-item-list">
|
||||
@csrf
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
@endauth
|
||||
"
|
||||
href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}"
|
||||
onclick="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">
|
||||
@click="removeLink('{{ __('shop::app.checkout.cart.cart-remove-action') }}')">
|
||||
|
||||
<span class="rango-delete fs24"></span>
|
||||
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
|
||||
|
|
@ -165,6 +165,12 @@
|
|||
{{ core()->currency( $item->base_total) }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@if (! cart()->isItemHaveQuantity($item))
|
||||
<div class="control-error mt-4 fs16 fw6">
|
||||
* {{ __('shop::app.checkout.cart.quantity-error') }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="row col-12" v-else>
|
||||
|
|
@ -281,13 +287,15 @@
|
|||
return {
|
||||
isMobileDevice: this.isMobile(),
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
removeLink(message) {
|
||||
if (! confirm(message))
|
||||
event.preventDefault();
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
function removeLink(message) {
|
||||
if (!confirm(message))
|
||||
event.preventDefault();
|
||||
}
|
||||
})()
|
||||
</script>
|
||||
@endpush
|
||||
|
|
@ -82,6 +82,7 @@
|
|||
url="{{ url()->to('/') }}"
|
||||
:header-content="{{ json_encode($velocityContent) }}"
|
||||
heading= "{{ __('velocity::app.menu-navbar.text-category') }}"
|
||||
category-count="{{ $velocityMetaData ? $velocityMetaData->sidebar_category_count : 10 }}"
|
||||
></content-header>
|
||||
|
||||
<div class="">
|
||||
|
|
|
|||
Loading…
Reference in New Issue