Merge branch 'master' of https://github.com/bagisto/bagisto into development
This commit is contained in:
rahulshukla-home
commit
961850b2e9
|
|
@ -3914,16 +3914,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v4.4.5",
|
||||
"version": "v4.4.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648"
|
||||
"reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/7e41b4fcad4619535f45f8bfa7744c4f384e1648",
|
||||
"reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/62f92509c9abfd1f73e17b8cf1b72c0bdac6611b",
|
||||
"reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3965,7 +3965,7 @@
|
|||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2020-02-13T19:40:01+00:00"
|
||||
"time": "2020-03-30T14:07:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
|
|
@ -4059,16 +4059,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/mime",
|
||||
"version": "v5.0.5",
|
||||
"version": "v5.0.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/mime.git",
|
||||
"reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c"
|
||||
"reference": "481b7d6da88922fb1e0d86a943987722b08f3955"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
|
||||
"reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
|
||||
"url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955",
|
||||
"reference": "481b7d6da88922fb1e0d86a943987722b08f3955",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4117,7 +4117,7 @@
|
|||
"mime",
|
||||
"mime-type"
|
||||
],
|
||||
"time": "2020-02-04T09:41:09+00:00"
|
||||
"time": "2020-03-27T16:56:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
|
|
@ -4238,16 +4238,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-idn",
|
||||
"version": "v1.14.0",
|
||||
"version": "v1.15.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-intl-idn.git",
|
||||
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a"
|
||||
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a",
|
||||
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
|
||||
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4261,7 +4261,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.14-dev"
|
||||
"dev-master": "1.15-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -4296,20 +4296,20 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2020-01-17T12:01:36+00:00"
|
||||
"time": "2020-03-09T19:04:49+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
"version": "v1.14.0",
|
||||
"version": "v1.15.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
|
||||
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
|
||||
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
|
||||
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4321,7 +4321,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.14-dev"
|
||||
"dev-master": "1.15-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -4355,7 +4355,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2020-01-13T11:15:53+00:00"
|
||||
"time": "2020-03-09T19:04:49+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php56",
|
||||
|
|
@ -4415,16 +4415,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php72",
|
||||
"version": "v1.14.0",
|
||||
"version": "v1.15.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php72.git",
|
||||
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf"
|
||||
"reference": "37b0976c78b94856543260ce09b460a7bc852747"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
|
||||
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
|
||||
"reference": "37b0976c78b94856543260ce09b460a7bc852747",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4433,7 +4433,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.14-dev"
|
||||
"dev-master": "1.15-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -4466,7 +4466,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2020-01-13T11:15:53+00:00"
|
||||
"time": "2020-02-27T09:26:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php73",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,12 @@
|
|||
|
||||
@section('content')
|
||||
<div class="content">
|
||||
<form method="POST" action="{{ route('admin.sliders.create') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
|
||||
<form
|
||||
method="POST"
|
||||
@submit.prevent="onSubmit"
|
||||
enctype="multipart/form-data"
|
||||
action="{{ route('admin.sliders.create') }}">
|
||||
|
||||
<div class="page-header">
|
||||
<div class="page-title">
|
||||
<h1>
|
||||
|
|
|
|||
|
|
@ -165,11 +165,11 @@ class RentalSlot extends Booking
|
|||
$requestedToDate = Carbon::createFromTimeString($cartItem['additional']['booking']['date_to'] . " 23:59:59");
|
||||
|
||||
$availableFrom = ! $bookingProduct->available_every_week && $bookingProduct->available_from
|
||||
? Carbon::createFromTimeString($bookingProduct->available_from)
|
||||
? Carbon::createFromTimeString($bookingProduct->available_from->format('Y-m-d') . ' 00:00:00')
|
||||
: Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
|
||||
|
||||
$availableTo = ! $bookingProduct->available_every_week && $bookingProduct->available_from
|
||||
? Carbon::createFromTimeString($bookingProduct->available_to)
|
||||
? Carbon::createFromTimeString($bookingProduct->available_to->format('Y-m-d') . ' 23:59:59')
|
||||
: Carbon::createFromTimeString('2080-01-01 00:00:00');
|
||||
|
||||
if ($requestedFromDate < $availableFrom
|
||||
|
|
|
|||
|
|
@ -6,12 +6,9 @@ use Webkul\Core\Models\Locale;
|
|||
/** @var \Illuminate\Database\Eloquent\Factory $factory */
|
||||
$factory->define(Locale::class, function (Faker $faker, array $attributes) {
|
||||
|
||||
$languageCode = $faker->languageCode;
|
||||
|
||||
$locale = Locale::query()->firstWhere('code', $languageCode);
|
||||
if ($locale !== null) {
|
||||
return $locale->id;
|
||||
}
|
||||
do {
|
||||
$languageCode = $faker->languageCode;
|
||||
} while (Locale::query()->where('code', $languageCode)->exists());
|
||||
|
||||
return [
|
||||
'code' => $languageCode,
|
||||
|
|
@ -22,4 +19,4 @@ $factory->define(Locale::class, function (Faker $faker, array $attributes) {
|
|||
|
||||
$factory->state(Category::class, 'rtl', [
|
||||
'direction' => 'rtl',
|
||||
]);
|
||||
]);
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 185 B |
|
|
@ -26,16 +26,21 @@ return [
|
|||
'name' => 'shop::app.layouts.wishlist',
|
||||
'route' =>'customer.wishlist.index',
|
||||
'sort' => 4,
|
||||
], [
|
||||
'key' => 'account.compare',
|
||||
'name' => 'velocity::app.customer.compare.text',
|
||||
'route' =>'velocity.customer.product.compare',
|
||||
'sort' => 5,
|
||||
], [
|
||||
'key' => 'account.orders',
|
||||
'name' => 'shop::app.layouts.orders',
|
||||
'route' =>'customer.orders.index',
|
||||
'sort' => 5,
|
||||
'sort' => 6,
|
||||
], [
|
||||
'key' => 'account.downloadables',
|
||||
'name' => 'shop::app.layouts.downloadable-products',
|
||||
'route' =>'customer.downloadable_products.index',
|
||||
'sort' => 6,
|
||||
'sort' => 7,
|
||||
]
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -289,6 +289,18 @@
|
|||
|
||||
this.disable_button = true;
|
||||
|
||||
if (this.allAddress.length > 0) {
|
||||
let address = this.allAddress.forEach(address => {
|
||||
if (address.id == this.address.billing.address_id) {
|
||||
this.address.billing.address1 = [address.address1];
|
||||
}
|
||||
|
||||
if (address.id == this.address.shipping.address_id) {
|
||||
this.address.shipping.address1 = [address.address1];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
|
||||
.then(function(response) {
|
||||
this_this.disable_button = false;
|
||||
|
|
|
|||
|
|
@ -8,5 +8,7 @@
|
|||
|
||||
@include('shop::products.wishlist')
|
||||
|
||||
@include('shop::products.compare')
|
||||
@include('shop::products.compare', [
|
||||
'productId' => $product->id
|
||||
])
|
||||
</div>
|
||||
|
|
@ -1,11 +1,101 @@
|
|||
{{-- @inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
|
||||
<compare-component product-id="{{ $productId }}"></compare-component>
|
||||
|
||||
@auth('customer')
|
||||
{!! view_render_event('bagisto.shop.products.wishlist.before') !!}
|
||||
@push('scripts')
|
||||
|
||||
<a @if ($wishListHelper->getWishlistProduct($product)) class="add-to-wishlist already" @else class="add-to-wishlist" @endif href="{{ route('customer.wishlist.add', $product->product_id) }}" id="wishlist-changer">
|
||||
<span class="icon wishlist-icon"></span>
|
||||
</a>
|
||||
<script type="text/x-template" id="compare-component-template">
|
||||
<a class="unset compare-icon text-right" @click="addProductToCompare" style="cursor: pointer">
|
||||
<img src="{{ asset('themes/default/assets/images/compare_arrows.png') }}" />
|
||||
</a>
|
||||
</script>
|
||||
|
||||
{!! view_render_event('bagisto.shop.products.wishlist.after') !!}
|
||||
@endauth --}}
|
||||
<script>
|
||||
Vue.component('compare-component', {
|
||||
props: ['productId'],
|
||||
|
||||
template: '#compare-component-template',
|
||||
|
||||
data: function () {
|
||||
return {
|
||||
'baseUrl': "{{ url()->to('/') }}",
|
||||
'customer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
'addProductToCompare': function () {
|
||||
if (this.customer == "true" || this.customer == true) {
|
||||
this.$http.put(
|
||||
`${this.baseUrl}/comparison`, {
|
||||
productId: this.productId,
|
||||
}
|
||||
).then(response => {
|
||||
window.flashMessages = [{
|
||||
'type': `alert-${response.data.status}`,
|
||||
'message': response.data.message
|
||||
}];
|
||||
|
||||
this.$root.addFlashMessages()
|
||||
}).catch(error => {
|
||||
window.flashMessages = [{
|
||||
'type': `alert-danger`,
|
||||
'message': "{{ __('velocity::app.error.something_went_wrong') }}"
|
||||
}];
|
||||
|
||||
this.$root.addFlashMessages()
|
||||
});
|
||||
} else {
|
||||
let updatedItems = [this.productId];
|
||||
let existingItems = this.getStorageValue('compared_product');
|
||||
|
||||
if (existingItems) {
|
||||
if (existingItems.indexOf(this.productId) == -1) {
|
||||
updatedItems = existingItems.concat(updatedItems);
|
||||
|
||||
this.setStorageValue('compared_product', updatedItems);
|
||||
|
||||
window.flashMessages = [{
|
||||
'type': `alert-success`,
|
||||
'message': "{{ __('velocity::app.customer.compare.added') }}"
|
||||
}];
|
||||
|
||||
this.$root.addFlashMessages()
|
||||
} else {
|
||||
window.flashMessages = [{
|
||||
'type': `alert-success`,
|
||||
'message': "{{ __('velocity::app.customer.compare.already_added') }}"
|
||||
}];
|
||||
|
||||
this.$root.addFlashMessages()
|
||||
}
|
||||
} else {
|
||||
this.setStorageValue('compared_product', updatedItems);
|
||||
|
||||
window.flashMessages = [{
|
||||
'type': `alert-success`,
|
||||
'message': "{{ __('velocity::app.customer.compare.added') }}"
|
||||
}];
|
||||
|
||||
this.$root.addFlashMessages()
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
'getStorageValue': function (key) {
|
||||
let value = window.localStorage.getItem(key);
|
||||
|
||||
if (value) {
|
||||
value = JSON.parse(value);
|
||||
}
|
||||
|
||||
return value;
|
||||
},
|
||||
|
||||
'setStorageValue': function (key, value) {
|
||||
window.localStorage.setItem(key, JSON.stringify(value));
|
||||
|
||||
return true;
|
||||
},
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
|
@ -7,7 +7,8 @@ class Tax
|
|||
/**
|
||||
* @var int
|
||||
*/
|
||||
public const TAX_PRECISION = 4;
|
||||
private const TAX_RATE_PRECISION = 4;
|
||||
private const TAX_AMOUNT_PRECISION = 2;
|
||||
|
||||
/**
|
||||
* Returns an array with tax rates and tax amount
|
||||
|
|
@ -20,7 +21,7 @@ class Tax
|
|||
$taxes = [];
|
||||
|
||||
foreach ($that->items as $item) {
|
||||
$taxRate = (string) round((float) $item->tax_percent, self::TAX_PRECISION);
|
||||
$taxRate = (string) round((float) $item->tax_percent, self::TAX_RATE_PRECISION);
|
||||
|
||||
if (! array_key_exists($taxRate, $taxes)) {
|
||||
$taxes[$taxRate] = 0;
|
||||
|
|
@ -29,6 +30,11 @@ class Tax
|
|||
$taxes[$taxRate] += $asBase ? $item->base_tax_amount : $item->tax_amount;
|
||||
}
|
||||
|
||||
// finally round tax amounts now (to reduce rounding differences)
|
||||
foreach ($taxes as $taxRate => $taxAmount) {
|
||||
$taxes[$taxRate] = round($taxAmount, self::TAX_AMOUNT_PRECISION);
|
||||
}
|
||||
|
||||
return $taxes;
|
||||
}
|
||||
|
||||
|
|
@ -45,7 +51,7 @@ class Tax
|
|||
$result = 0;
|
||||
|
||||
foreach ($taxes as $taxRate => $taxAmount) {
|
||||
$result += round($taxAmount, 2);
|
||||
$result += $taxAmount;
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=8238d4a34ce254a81437",
|
||||
"/css/ui.css": "/css/ui.css?id=78f86756674b5f637c8b"
|
||||
"/css/ui.css": "/css/ui.css?id=8c35163268c09336c2bc"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -645,8 +645,10 @@ h5 {
|
|||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
margin-left: -34px;
|
||||
margin-top: 2px;
|
||||
pointer-events: none;
|
||||
left: 70%;
|
||||
position: absolute;
|
||||
top: 35px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"/js/velocity.js": "/js/velocity.js?id=b795a54f5795ed77fa28",
|
||||
"/js/velocity.js": "/js/velocity.js?id=08fbd43328947b542230",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
|
||||
"/css/velocity.css": "/css/velocity.css?id=a68c6d04ce36e1455e1e"
|
||||
"/css/velocity.css": "/css/velocity.css?id=36d764b0132cc96105c2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,11 +34,13 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
|
|||
'view' => 'shop::guest.compare.index'
|
||||
]);
|
||||
|
||||
Route::get('/customer/account/comparison', 'ComparisonController@getComparisonList')
|
||||
->name('velocity.customer.product.compare')
|
||||
->defaults('_config', [
|
||||
'view' => 'shop::customers.account.compare.index'
|
||||
]);
|
||||
Route::group(['middleware' => ['customer']], function () {
|
||||
Route::get('/customer/account/comparison', 'ComparisonController@getComparisonList')
|
||||
->name('velocity.customer.product.compare')
|
||||
->defaults('_config', [
|
||||
'view' => 'shop::customers.account.compare.index'
|
||||
]);
|
||||
});
|
||||
|
||||
Route::put('/comparison', 'ComparisonController@addCompareProduct')
|
||||
->name('customer.product.add.compare');
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
<template>
|
||||
<div class="modal-container" v-if="isModalOpen">
|
||||
<div class="modal-header">
|
||||
<slot name="header">
|
||||
Default header
|
||||
</slot>
|
||||
<i class="icon remove-icon" @click="closeModal"></i>
|
||||
</div>
|
||||
<div class="modal-parent scrollable" v-if="isModalOpen">
|
||||
<div class="modal-container">
|
||||
<div class="modal-header">
|
||||
<slot name="header">
|
||||
Default header
|
||||
</slot>
|
||||
<i class="icon remove-icon" @click="closeModal"></i>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<slot name="body">
|
||||
Default body
|
||||
</slot>
|
||||
<div class="modal-body">
|
||||
<slot name="body">
|
||||
Default body
|
||||
</slot>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -23,12 +25,8 @@
|
|||
return {}
|
||||
},
|
||||
|
||||
created () {
|
||||
this.closeModal();
|
||||
},
|
||||
|
||||
computed: {
|
||||
isModalOpen () {
|
||||
isModalOpen: function () {
|
||||
this.addClassToBody();
|
||||
|
||||
return this.isOpen;
|
||||
|
|
@ -36,12 +34,13 @@
|
|||
},
|
||||
|
||||
methods: {
|
||||
closeModal () {
|
||||
this.$root.$set(this.$root.modalIds, this.id, true);
|
||||
closeModal: function () {
|
||||
this.$root.$set(this.$root.modalIds, this.id, false);
|
||||
},
|
||||
|
||||
addClassToBody () {
|
||||
addClassToBody: function () {
|
||||
var body = document.querySelector("body");
|
||||
|
||||
if(this.isOpen) {
|
||||
body.classList.add("modal-open");
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
methods: {
|
||||
addProductToCompare: function () {
|
||||
if (this.customer == "true") {
|
||||
if (this.customer == "true" || this.customer == true) {
|
||||
this.$http.put(
|
||||
`${this.$root.baseUrl}/comparison`, {
|
||||
productId: this.productId,
|
||||
|
|
|
|||
|
|
@ -249,9 +249,12 @@ body {
|
|||
|
||||
> div:last-child {
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
* {
|
||||
// height: 100%;
|
||||
> div {
|
||||
.default {
|
||||
padding: 5px;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -281,7 +284,6 @@ body {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
.dropdown-menu {
|
||||
border-top: 3px solid $border-primary;
|
||||
border-radius: 0px;
|
||||
|
|
|
|||
|
|
@ -174,23 +174,25 @@
|
|||
}
|
||||
|
||||
.modal-container {
|
||||
background: #ffffff;
|
||||
left: 50%;
|
||||
top: 100px;
|
||||
z-index: 11;
|
||||
width: 600px;
|
||||
max-width: 80%;
|
||||
left: 50%;
|
||||
margin-left: -300px;
|
||||
max-height: 80%;
|
||||
position: fixed;
|
||||
z-index: 11;
|
||||
font-size: 14px;
|
||||
overflow-y: auto;
|
||||
margin-left: -300px;
|
||||
background: #ffffff;
|
||||
animation: jelly 0.5s ease-in-out;
|
||||
animation: fade-in-white 0.3s ease-in-out;
|
||||
|
||||
@include border-radius(5px);
|
||||
@include box-shadow(
|
||||
0px 15px 25px 0px rgba(0, 0, 0, 0.03),
|
||||
0px 20px 45px 5px rgba(0, 0, 0, 0.2)
|
||||
);
|
||||
animation: fade-in-white 0.3s ease-in-out;
|
||||
animation: jelly 0.5s ease-in-out;
|
||||
@include border-radius(5px);
|
||||
overflow-y: auto;
|
||||
max-height: 80%;
|
||||
|
||||
.modal-header {
|
||||
padding: 20px;
|
||||
|
|
@ -205,6 +207,15 @@
|
|||
.icon {
|
||||
float: right;
|
||||
cursor: pointer;
|
||||
|
||||
&.remove-icon {
|
||||
width: 24px;
|
||||
right: 20px;
|
||||
height: 24px;
|
||||
margin-right: 0;
|
||||
position: absolute;
|
||||
background-image: url(/themes/velocity/assets/images/Icon-remove.svg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -491,9 +502,8 @@
|
|||
.customer-options{
|
||||
top: 40px;
|
||||
float: right;
|
||||
height: 100%;
|
||||
padding: 20px;
|
||||
height: 150px;
|
||||
overflow-y: scroll;
|
||||
width: 200px !important;
|
||||
|
||||
|
||||
|
|
@ -861,7 +871,8 @@
|
|||
}
|
||||
|
||||
input,
|
||||
select {
|
||||
select,
|
||||
textarea {
|
||||
width: 100%;
|
||||
resize: none;
|
||||
font-size: 16px;
|
||||
|
|
@ -873,6 +884,8 @@
|
|||
|
||||
input:active,
|
||||
input:focus,
|
||||
textarea:active,
|
||||
textarea:focus,
|
||||
select:focus,
|
||||
select:active {
|
||||
border-color: $theme-color;
|
||||
|
|
@ -1272,18 +1285,15 @@
|
|||
i {
|
||||
color: $black-color;
|
||||
}
|
||||
|
||||
i:hover::before {
|
||||
// content: "\E93D";
|
||||
}
|
||||
}
|
||||
|
||||
.checkout-process {
|
||||
padding: 40px 20px;
|
||||
|
||||
.col-7 {
|
||||
> div {
|
||||
width: 100%;
|
||||
.col-lg-7 {
|
||||
.coupon-container,
|
||||
> div:not(:first-child) {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2311,6 +2321,10 @@
|
|||
margin-left: 0 !important;
|
||||
margin-right: 10px !important;
|
||||
|
||||
tr {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
td {
|
||||
padding: 15px;
|
||||
min-width: 250px;
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ return [
|
|||
'login' => 'Login',
|
||||
'become-user' => 'Become User',
|
||||
'user-registration' => 'User Registration',
|
||||
'form-sginup-text' => 'If you are new to our store, we glab to have you as member.',
|
||||
'form-sginup-text' => 'If you are new to our store, we glad to have you as member.',
|
||||
],
|
||||
'forget-password' => [
|
||||
'login' => 'Login',
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@
|
|||
|
||||
<label class="switch">
|
||||
<input
|
||||
type="checkbox"
|
||||
class="control"
|
||||
id="slides"
|
||||
name="slides"
|
||||
type="checkbox"
|
||||
class="control"
|
||||
data-vv-as=""slides""
|
||||
{{ $metaData && $metaData->slider ? 'checked' : ''}} />
|
||||
|
||||
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
|
|
@ -111,7 +111,11 @@
|
|||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.advertisement-four') }}</label>
|
||||
|
||||
@if(! isset($metaData->advertisement[4]))
|
||||
@php
|
||||
$advertisement = json_decode($metaData->get('advertisement')->all()[0]->advertisement, true);
|
||||
@endphp
|
||||
|
||||
@if(! isset($advertisement[4]))
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
|
||||
input-name="images[4]">
|
||||
|
|
@ -119,14 +123,14 @@
|
|||
@else
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
|
||||
input-name="images[4]" :images='@json($metaData->advertisement[4])'>
|
||||
input-name="images[4]" :images='@json($advertisement[4])'>
|
||||
</image-wrapper>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.advertisement-three') }}</label>
|
||||
@if(! isset($metaData->advertisement[3]))
|
||||
@if(! isset($advertisement[3]))
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
|
||||
input-name="images[3]">
|
||||
|
|
@ -134,7 +138,7 @@
|
|||
@else
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
|
||||
input-name="images[3]" :images='@json($metaData->advertisement[3])'>
|
||||
input-name="images[3]" :images='@json($advertisement[3])'>
|
||||
</image-wrapper>
|
||||
@endif
|
||||
</div>
|
||||
|
|
@ -142,7 +146,7 @@
|
|||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.advertisement-two') }}</label>
|
||||
|
||||
@if(! isset($metaData->advertisement[2]))
|
||||
@if(! isset($advertisement[2]))
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
|
||||
input-name="images[2]">
|
||||
|
|
@ -150,7 +154,7 @@
|
|||
@else
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
|
||||
input-name="images[2]" :images='@json($metaData->advertisement[2])'>
|
||||
input-name="images[2]" :images='@json($advertisement[2])'>
|
||||
</image-wrapper>
|
||||
@endif
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -309,19 +309,15 @@
|
|||
},
|
||||
|
||||
loginCustomer: function() {
|
||||
var this_this = this;
|
||||
|
||||
this_this.$http.post("{{ route('customer.checkout.login') }}", {
|
||||
email: this_this.address.billing.email,
|
||||
password: this_this.address.billing.password
|
||||
this.$http.post("{{ route('customer.checkout.login') }}", {
|
||||
email: this.address.billing.email,
|
||||
password: this.address.billing.password
|
||||
})
|
||||
.then(function(response) {
|
||||
.then(response => {
|
||||
if (response.data.success) {
|
||||
window.location.href = "{{ route('shop.checkout.onepage.index') }}";
|
||||
} else {
|
||||
window.flashMessages = [{'type': 'alert-error', 'message': response.data.error }];
|
||||
|
||||
this_this.$root.addFlashMessages()
|
||||
window.showAlert(`alert-danger`, this.__('shop.general.alert.danger'), response.data.error);
|
||||
}
|
||||
})
|
||||
.catch(function (error) {})
|
||||
|
|
@ -341,6 +337,18 @@
|
|||
saveAddress: function() {
|
||||
this.disable_button = true;
|
||||
|
||||
if (this.allAddress.length > 0) {
|
||||
let address = this.allAddress.forEach(address => {
|
||||
if (address.id == this.address.billing.address_id) {
|
||||
this.address.billing.address1 = [address.address1];
|
||||
}
|
||||
|
||||
if (address.id == this.address.shipping.address_id) {
|
||||
this.address.shipping.address1 = [address.address1];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
|
||||
.then(response => {
|
||||
this.disable_button = false;
|
||||
|
|
@ -449,9 +457,7 @@
|
|||
.catch(error => {
|
||||
this.disable_button = true;
|
||||
|
||||
window.flashMessages = [{'type': 'alert-error', 'message': "{{ __('shop::app.common.error') }}" }];
|
||||
|
||||
this.$root.addFlashMessages();
|
||||
window.showAlert(`alert-danger`, this.__('shop.general.alert.danger'), "{{ __('shop::app.common.error') }}");
|
||||
})
|
||||
} else {
|
||||
this.disable_button = true;
|
||||
|
|
|
|||
|
|
@ -272,11 +272,6 @@
|
|||
</span>
|
||||
</div>
|
||||
|
||||
{{-- for customer login checkout --}}
|
||||
@if (! $isCustomer)
|
||||
@include('shop::checkout.onepage.customer-checkout')
|
||||
@endif
|
||||
|
||||
<div :class="`col-12 form-field ${errors.has('address-form.billing[first_name]') ? 'has-error' : ''}`">
|
||||
<label for="billing[first_name]" class="mandatory">
|
||||
{{ __('shop::app.checkout.onepage.first-name') }}
|
||||
|
|
@ -338,6 +333,11 @@
|
|||
</span>
|
||||
</div>
|
||||
|
||||
{{-- for customer login checkout --}}
|
||||
@if (! $isCustomer)
|
||||
@include('shop::checkout.onepage.customer-checkout')
|
||||
@endif
|
||||
|
||||
<div :class="`col-12 form-field ${errors.has('address-form.billing[address1][]') ? 'has-error' : ''}`" style="margin-bottom: 0;">
|
||||
<label for="billing_address_0" class="mandatory">
|
||||
{{ __('shop::app.checkout.onepage.address1') }}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
<div class="form-container">
|
||||
<accordian :title="'{{ __('shop::app.checkout.payment-methods') }}'" :active="true">
|
||||
<div class="form-header mb-30" slot="header">
|
||||
|
||||
<h3 class="fw6 display-inbl">
|
||||
{{ __('shop::app.checkout.onepage.payment-methods') }}
|
||||
</h3>
|
||||
|
||||
<i class="rango-arrow"></i>
|
||||
</div>
|
||||
|
||||
|
|
@ -17,13 +19,13 @@
|
|||
<div>
|
||||
<label class="radio-container">
|
||||
<input
|
||||
v-validate="'required'"
|
||||
type="radio"
|
||||
id="{{ $payment['method'] }}"
|
||||
name="payment[method]"
|
||||
value="{{ $payment['method'] }}"
|
||||
v-validate="'required'"
|
||||
v-model="payment.method"
|
||||
@change="methodSelected()"
|
||||
id="{{ $payment['method'] }}"
|
||||
value="{{ $payment['method'] }}"
|
||||
data-vv-as=""{{ __('shop::app.checkout.onepage.payment-method') }}"" />
|
||||
|
||||
<span class="checkmark"></span>
|
||||
|
|
|
|||
|
|
@ -10,4 +10,21 @@
|
|||
@yield('page-detail-wrapper')
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@endsection
|
||||
|
||||
@push('scripts')
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
let sidebarHeight = $('.customer-sidebar').css('height');
|
||||
let contentHeight = $('.account-layout').css('height');
|
||||
|
||||
sidebarHeight = parseInt(sidebarHeight.substring(0, sidebarHeight.length - 2));
|
||||
contentHeight = parseInt(contentHeight.substring(0, contentHeight.length - 2));
|
||||
|
||||
let height = sidebarHeight > contentHeight ? sidebarHeight + 30 : contentHeight;
|
||||
height = height + "px";
|
||||
|
||||
$('.account-content').css('height', height);
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
|
@ -18,11 +18,7 @@
|
|||
$subMenuCollection['orders'] = $menuItem['children']['orders'];
|
||||
$subMenuCollection['downloadables'] = $menuItem['children']['downloadables'];
|
||||
$subMenuCollection['wishlist'] = $menuItem['children']['wishlist'];
|
||||
$subMenuCollection['compare'] = [
|
||||
'key' => 'account.compare',
|
||||
'name' => 'velocity::app.customer.compare.text',
|
||||
'url' => route('velocity.customer.product.compare'),
|
||||
];
|
||||
$subMenuCollection['compare'] = $menuItem['children']['compare'];
|
||||
$subMenuCollection['reviews'] = $menuItem['children']['reviews'];
|
||||
$subMenuCollection['address'] = $menuItem['children']['address'];
|
||||
} catch (\Exception $exception) {
|
||||
|
|
|
|||
|
|
@ -5,25 +5,10 @@
|
|||
@endsection
|
||||
|
||||
@push('css')
|
||||
<style type="text/css">
|
||||
<style>
|
||||
.account-head {
|
||||
height: 50px;
|
||||
}
|
||||
.remove-icon {
|
||||
right: 15px;
|
||||
font-size: 22px;
|
||||
height: 24px;
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
border-radius: 50%;
|
||||
color: #333;
|
||||
width: 24px;
|
||||
padding: 0px;
|
||||
top: 10px;
|
||||
}
|
||||
.remove-icon:before {
|
||||
content: "x";
|
||||
}
|
||||
</style>
|
||||
@endpush
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,12 @@
|
|||
|
||||
@section('body-header')
|
||||
@include('shop::layouts.top-nav.index')
|
||||
@include('shop::layouts.header.index')
|
||||
|
||||
{!! view_render_event('bagisto.shop.layout.header.before') !!}
|
||||
|
||||
@include('shop::layouts.header.index')
|
||||
|
||||
{!! view_render_event('bagisto.shop.layout.header.after') !!}
|
||||
|
||||
<div class="main-content-wrapper col-12 no-padding">
|
||||
@php
|
||||
|
|
|
|||
|
|
@ -28,10 +28,9 @@
|
|||
@if (count(core()->getCurrentChannel()->locales) == 1)
|
||||
disabled="disabled"
|
||||
@endif>
|
||||
|
||||
|
||||
@foreach (core()->getCurrentChannel()->locales as $locale)
|
||||
@if (isset($serachQuery))
|
||||
@dd(app()->getLocale());
|
||||
<option
|
||||
value="?{{ $serachQuery }}&locale={{ $locale->code }}"
|
||||
{{ $locale->code == app()->getLocale() ? 'selected' : '' }}>
|
||||
|
|
|
|||
|
|
@ -72,11 +72,11 @@ class TaxCest
|
|||
$this->scenario = [
|
||||
'object' => Cart::getCart(),
|
||||
'expectedTaxRates' => [
|
||||
(string)round((float)$tax1->tax_rate, \Webkul\Tax\Helpers\Tax::TAX_PRECISION)
|
||||
=> round(11 * $product1->price * $tax1->tax_rate / 100, 4),
|
||||
(string)round((float)$tax1->tax_rate, 4)
|
||||
=> round(11 * $product1->price * $tax1->tax_rate / 100, 2),
|
||||
|
||||
(string)round((float)$tax2->tax_rate, \Webkul\Tax\Helpers\Tax::TAX_PRECISION)
|
||||
=> round(7 * $product2->price * $tax2->tax_rate / 100, 4),
|
||||
(string)round((float)$tax2->tax_rate, 4)
|
||||
=> round(7 * $product2->price * $tax2->tax_rate / 100, 2),
|
||||
],
|
||||
'expectedTaxTotal' =>
|
||||
round(
|
||||
|
|
|
|||
Loading…
Reference in New Issue