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

Merge branch 'master' into optimization-attempt

This commit is contained in:
devansh bawari 2021-07-08 10:07:32 +05:30
parent b3884fe5f7 2571b8a7eb
commit c59ef9087c
21 changed files with 230 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Webkul/Admin/src/Resources/views/sales/refunds/create.blade.php
View File

@ -230,6 +230,7 @@
<tr>
<th>{{ __('admin::app.sales.orders.SKU') }}</th>
<th>{{ __('admin::app.sales.orders.product-name') }}</th>
<th>{{ __('admin::app.sales.orders.price') }}</th>
<th>{{ __('admin::app.sales.orders.item-status') }}</th>
<th>{{ __('admin::app.sales.orders.subtotal') }}</th>
<th>{{ __('admin::app.sales.orders.tax-amount') }}</th>
@ -261,6 +262,8 @@
@endif
</td>
<td>{{ core()->formatBasePrice($item->base_price) }}</td>
<td>
<span class="qty-row">
{{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }}
@ -283,7 +286,7 @@
</span>
</td>
<td>{{ core()->formatBasePrice($item->base_price) }}</td>
<td>{{ core()->formatBasePrice($item->base_total) }}</td>
<td>{{ core()->formatBasePrice($item->base_tax_amount) }}</td>

5
packages/Webkul/Core/src/Console/Commands/Install.php
View File

@ -73,6 +73,11 @@ class Install extends Command
$result = shell_exec('composer dump-autoload');
$this->info($result);
// removing the installer directory
if (is_dir('public/installer')) {
shell_exec('rm -rf public/installer');
}
// final information
$this->info('-----------------------------');
$this->info('Congratulations!');

8
packages/Webkul/Shop/src/Http/routes.php
View File

@ -247,7 +247,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
Route::get('addresses/default/{id}', 'Webkul\Customer\Http\Controllers\AddressController@makeDefault')->name('make.default.address');
//Customer Address Delete
Route::get('addresses/delete/{id}', 'Webkul\Customer\Http\Controllers\AddressController@destroy')->name('address.delete');
Route::delete('addresses/delete/{id}', 'Webkul\Customer\Http\Controllers\AddressController@destroy')->name('address.delete');
/* Wishlist route */
//Customer wishlist(listing)
@ -281,7 +281,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
'view' => 'shop::customers.account.orders.print'
])->name('customer.orders.print');
Route::get('/orders/cancel/{id}', 'Webkul\Shop\Http\Controllers\OrderController@cancel')->name('customer.orders.cancel');
Route::post('/orders/cancel/{id}', 'Webkul\Shop\Http\Controllers\OrderController@cancel')->name('customer.orders.cancel');
/* Reviews route */
//Customer reviews
@ -290,12 +290,12 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
])->name('customer.reviews.index');
//Customer review delete
Route::get('reviews/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [
Route::delete('reviews/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [
'redirect' => 'customer.reviews.index'
])->name('customer.review.delete');
//Customer all review delete
Route::get('reviews/all-delete', 'Webkul\Shop\Http\Controllers\ReviewController@deleteAll')->defaults('_config', [
Route::delete('reviews/all-delete', 'Webkul\Shop\Http\Controllers\ReviewController@deleteAll')->defaults('_config', [
'redirect' => 'customer.reviews.index'
])->name('customer.review.deleteall');
});

11
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -391,7 +391,16 @@ return [
'view' => [
'page-tile' => '#:id مراجعة',
]
],
'delete' => [
'confirmation-message' => 'هل أنت متأكد أنك تريد حذف هذه المراجعة؟',
],
'delete-all' => [
'title' => 'حذف الكل',
'confirmation-message' => 'هل أنت متأكد أنك تريد حذف جميع المراجعات؟',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/de/app.php
View File

@ -388,7 +388,16 @@ return [
'view' => [
'page-tile' => 'Bewertung #:id',
]
],
'delete' => [
'confirmation-message' => 'Möchten Sie diese Bewertung wirklich löschen?',
],
'delete-all' => [
'title' => 'Alles löschen',
'confirmation-message' => 'Möchten Sie wirklich alle Bewertungen löschen?',
],
]
]
],

14
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -387,12 +387,22 @@ return [
'review' => [
'index' => [
'title' => 'Reviews',
'page-title' => 'Reviews'
'page-title' => 'Reviews',
],
'view' => [
'page-tile' => 'Review #:id',
]
],
'delete' => [
'confirmation-message' => 'Are you sure you want to delete this review?',
],
'delete-all' => [
'title' => 'Delete All',
'confirmation-message' => 'Are you sure you want to delete all the reviews?',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -391,7 +391,16 @@ return [
'view' => [
'page-tile' => 'Opinión #:id',
]
],
'delete' => [
'confirmation-message' => '¿Seguro que quieres eliminar esta crítica?',
],
'delete-all' => [
'title' => 'Eliminar todos',
'confirmation-message' => '¿Estás segura de que quieres eliminar todas las críticas?',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -387,7 +387,16 @@ return [
'view' => [
'page-tile' => '#:id بررسی',
]
],
'delete' => [
'confirmation-message' => 'آیا شما مطمئن هستید که می خواهید این نظر را حذف کنید؟',
],
'delete-all' => [
'title' => 'حذف همه',
'confirmation-message' => 'آیا مطمئن هستید که می خواهید همه بررسی ها را حذف کنید؟',
],
]
]
],

9
packages/Webkul/Shop/src/Resources/lang/fr/app.php
View File

@ -390,6 +390,15 @@ return [
'view' => [
'page-tile' => 'Avis n° :id',
],
'delete' => [
'confirmation-message' => 'Êtes-vous sûr de vouloir supprimer cet avis ?',
],
'delete-all' => [
'title' => 'Tout supprimer',
'confirmation-message' => 'Êtes-vous sûr de vouloir supprimer tous les avis ?',
],
],
],
],

11
packages/Webkul/Shop/src/Resources/lang/it/app.php
View File

@ -389,7 +389,16 @@ return [
'view' => [
'page-tile' => 'Recensione #:id',
]
],
'delete' => [
'confirmation-message' => 'Sei sicuro di voler eliminare questa recensione?',
],
'delete-all' => [
'title' => 'Cancella tutto',
'confirmation-message' => 'Sei sicuro di voler eliminare tutte le recensioni?',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/ja/app.php
View File

@ -369,7 +369,16 @@ return [
'view' => [
'page-tile' => 'レビュー #:id',
]
],
'delete' => [
'confirmation-message' => 'このレビューを削除してもよろしいですか？',
],
'delete-all' => [
'title' => 'すべて削除',
'confirmation-message' => 'すべてのレビューを削除してもよろしいですか？',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -395,7 +395,16 @@ return [
'view' => [
'page-tile' => 'Recensies #:id',
]
],
'delete' => [
'confirmation-message' => 'Weet je zeker dat je deze recensie wilt verwijderen?',
],
'delete-all' => [
'title' => 'Verwijder alles',
'confirmation-message' => 'Weet u zeker dat u alle beoordelingen wilt verwijderen?',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/pl/app.php
View File

@ -389,7 +389,16 @@ return [
'view' => [
'page-tile' => 'Recenzja #:id',
]
],
'delete' => [
'confirmation-message' => 'Czy na pewno chcesz usunąć tę recenzję?',
],
'delete-all' => [
'title' => 'Usuń wszystko',
'confirmation-message' => 'Czy na pewno chcesz usunąć wszystkie opinie?',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

@ -383,7 +383,16 @@ return [
'view' => [
'page-tile' => 'Avaliação #:id',
]
],
'delete' => [
'confirmation-message' => 'Tem certeza de que deseja excluir este comentário?',
],
'delete-all' => [
'title' => 'Apagar tudo',
'confirmation-message' => 'Tem certeza de que deseja excluir todos os comentários?',
],
]
]
],

11
packages/Webkul/Shop/src/Resources/lang/tr/app.php
View File

@ -388,7 +388,16 @@ return [
'view' => [
'page-tile' => 'İnceleme #:id',
]
],
'delete' => [
'confirmation-message' => 'Bu incelemeyi silmek istediğinizden emin misiniz?',
],
'delete-all' => [
'title' => 'Hepsini sil',
'confirmation-message' => 'Tüm yorumları silmek istediğinizden emin misiniz?',
],
]
]
],

31
packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php
View File

@ -77,18 +77,22 @@
</ul>
<div class="control-links mt-20">
<span>
<a href="{{ route('customer.address.edit', $address->id) }}">
{{ __('shop::app.customer.account.address.index.edit') }}
</a>
</span>
<span>
<a href="{{ route('customer.address.edit', $address->id) }}">
{{ __('shop::app.customer.account.address.index.edit') }}
</a>
</span>
<span>
<a href="{{ route('address.delete', $address->id) }}"
onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
{{ __('shop::app.customer.account.address.index.delete') }}
</a>
</span>
<a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
{{ __('shop::app.customer.account.address.index.delete') }}
</a>
<form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
@method('delete')
@csrf
</form>
</span>
</div>
</div>
</div>
@ -105,8 +109,11 @@
@push('scripts')
<script>
function deleteAddress(message) {
if (!confirm(message))
event.preventDefault();
if (! confirm(message)) {
return;
}
$('#deleteAddressForm').submit();
}
</script>
@endpush

18
packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
View File

@ -21,7 +21,11 @@
@if ($order->canCancel())
<a href="{{ route('customer.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right;">
<form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
@csrf
</form>
<a href="javascript:void(0);" class="btn btn-lg btn-primary" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right;">
{{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
</a>
@endif
@ -560,3 +564,15 @@
</div>
@endsection
@push('scripts')
<script>
function cancelOrder(message) {
if (! confirm(message)) {
return;
}
$('#cancelOrderForm').submit();
}
</script>
@endpush

21
packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
View File

@ -17,7 +17,14 @@
@if (count($reviews) > 1)
<div class="account-action">
<a href="{{ route('customer.review.deleteall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
<form id="deleteAllReviewForm" action="{{ route('customer.review.deleteall') }}" method="post">
@method('delete')
@csrf
</form>
<a href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete-all.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
{{ __('shop::app.customer.account.review.delete-all.title') }}
</a>
</div>
@endif
@ -57,9 +64,17 @@
</div>
<div class="operations">
<a class="mb-50" href="{{ route('customer.review.delete', $review->id) }}"><span class="icon trash-icon"></span></a>
<form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
@method('delete')
@csrf
</form>
<a class="mb-50" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
<span class="icon trash-icon"></span>
</a>
</div>
</div>
<div class="horizontal-rule mb-10 mt-10"></div>
@endforeach
@ -77,4 +92,4 @@
{!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
</div>
</div>
@endsection
@endsection

18
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php
View File

@ -56,13 +56,14 @@
{{ __('shop::app.customer.account.address.index.edit') }}
</a>
<a
class="card-link"
href="{{ route('address.delete', $address->id) }}"
onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
<a class="card-link" href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
{{ __('shop::app.customer.account.address.index.delete') }}
</a>
<form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
@method('delete')
@csrf
</form>
</div>
</div>
</div>
@ -77,8 +78,11 @@
@push('scripts')
<script>
function deleteAddress(message) {
if (!confirm(message))
event.preventDefault();
if (! confirm(message)) {
return;
}
$('#deleteAddressForm').submit();
}
</script>
@endpush

20
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
View File

@ -28,7 +28,11 @@
@if ($order->canCancel())
<span class="account-action">
<a href="{{ route('customer.orders.cancel', $order->id) }}" class="theme-btn light unset float-right" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right">
<form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
@csrf
</form>
<a href="javascript:void(0);" class="theme-btn light unset float-right" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right">
{{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
</a>
</span>
@ -579,4 +583,16 @@
{!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
</div>
</div>
@endsection
@endsection
@push('scripts')
<script>
function cancelOrder(message) {
if (! confirm(message)) {
return;
}
$('#cancelOrderForm').submit();
}
</script>
@endpush

16
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
View File

@ -16,8 +16,13 @@
@if (count($reviews) > 1)
<div class="account-action float-right">
<a href="{{ route('customer.review.deleteall') }}" class="theme-btn light unset">
{{ __('shop::app.customer.account.wishlist.deleteall') }}
<form id="deleteAllReviewForm" action="{{ route('customer.review.deleteall') }}" method="post">
@method('delete')
@csrf
</form>
<a href="javascript:void(0);" class="theme-btn light unset" onclick="confirm('{{ __('shop::app.customer.account.review.delete-all.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
{{ __('shop::app.customer.account.review.delete-all.title') }}
</a>
</div>
@endif
@ -59,7 +64,12 @@
</div>
<div class="col-2">
<a class="unset" href="{{ route('customer.review.delete', $review->id) }}">
<form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
@method('delete')
@csrf
</form>
<a class="unset" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
<span class="rango-delete fs24"></span>
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
</a>