Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
This commit is contained in:
commit
4fcd6e5209
|
|
@ -166,4 +166,19 @@ class SliderDataGrid extends DataGrid
|
|||
'icon' => 'icon trash-icon',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare mass actions.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function prepareMassActions()
|
||||
{
|
||||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'action' => route('admin.sliders.massdelete'),
|
||||
'method' => 'POST',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,26 +75,25 @@ return [
|
|||
'tax-categories' => 'فئات الضرائب',
|
||||
'tax-rates' => 'المعدلات الضريبية',
|
||||
'refunds' => 'المبالغ المستردة',
|
||||
'marketing' => 'Marketing',
|
||||
'marketing' => 'تسويق',
|
||||
'promotions' => 'الترقيات',
|
||||
'email-marketing' => 'Email Marketing',
|
||||
'campaigns' => 'Campaigns',
|
||||
'email-templates' => 'Email Templates',
|
||||
'email-marketing' => 'التسويق عبر البريد الإلكتروني',
|
||||
'campaigns' => 'الحملات',
|
||||
'email-templates' => 'قوالب البريد الإلكتروني',
|
||||
'discount' => 'خصم',
|
||||
'cms' => 'CMS',
|
||||
'transactions' => 'المعاملات',
|
||||
'mode' => 'الوضع',
|
||||
'account-title' => 'حساب',
|
||||
],
|
||||
|
||||
'acl' => [
|
||||
'dashboard' => 'لوحة التحكم',
|
||||
'sales' => 'المبيعات',
|
||||
'cancel' => 'Cancel',
|
||||
'cancel' => 'يلغي',
|
||||
'orders' => 'الطلبات',
|
||||
'shipments' => 'الشحنات',
|
||||
'invoices' => 'الفواتير',
|
||||
'refunds' => 'Refunds',
|
||||
'refunds' => 'المبالغ المعادة',
|
||||
'catalog' => 'فهرس',
|
||||
'products' => 'المنتجات',
|
||||
'copy' => 'Copy',
|
||||
|
|
@ -102,8 +101,8 @@ return [
|
|||
'attributes' => 'الصفات',
|
||||
'attribute-families' => 'وصف الأسر',
|
||||
'customers' => 'زبائن',
|
||||
'addresses' => 'Addresses',
|
||||
'note' => 'Note',
|
||||
'addresses' => 'عناوين',
|
||||
'note' => 'ملحوظة',
|
||||
'groups' => 'المجموعات',
|
||||
'reviews' => 'باء-الاستعراضات',
|
||||
'newsletter-subscriptions' => 'الاشتراك في الرسالة الإخبارية',
|
||||
|
|
@ -124,9 +123,9 @@ return [
|
|||
'edit' => 'تعديل',
|
||||
'create' => 'أضف',
|
||||
'delete' => 'حذف',
|
||||
'mass-delete' => 'Mass Delete',
|
||||
'mass-update' => 'Mass Update',
|
||||
'marketing' => 'Marketing',
|
||||
'mass-delete' => 'حذف جماعي',
|
||||
'mass-update' => 'التحديث الشامل',
|
||||
'marketing' => 'تسويق',
|
||||
'promotions' => 'الترقيات',
|
||||
'cart-rules' => 'قواعد سلة التسوق',
|
||||
'catalog-rules' => 'قواعد الكتالوج',
|
||||
|
|
|
|||
|
|
@ -20,15 +20,16 @@
|
|||
<ul class="menubar">
|
||||
@foreach ($menu->items as $menuItem)
|
||||
<li class="menu-item {{ $menu->getActive($menuItem) }}">
|
||||
<a class="menubar-ancor" href="{{ $menuItem['url'] }}">
|
||||
<a class="menubar-anchor" href="{{ $menuItem['url'] }}">
|
||||
<span class="icon-menu icon {{ $menuItem['icon-class'] }}"></span>
|
||||
|
||||
<span class="menu-label">{{ trans($menuItem['name']) }}</span>
|
||||
|
||||
@if(count($menuItem['children']) || $menuItem['key'] == 'configuration' )
|
||||
<span
|
||||
class="icon arrow-icon {{ $menu->getActive($menuItem) == 'active' ? 'rotate-arrow-icon' : '' }} {{ ( core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl' ) ? 'arrow-icon-right' :'arrow-icon-left' }}"
|
||||
class="icon arrow-icon {{ $menu->getActive($menuItem) == 'active' ? 'rotate-arrow-icon' : '' }} {{ ( core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl' ) ? 'arrow-icon-right' :'arrow-icon-left' }}"
|
||||
></span>
|
||||
|
||||
@endif
|
||||
</a>
|
||||
@if ($menuItem['key'] != 'configuration')
|
||||
|
|
@ -60,3 +61,24 @@
|
|||
|
||||
<nav-slide-button id="nav-expand-button" icon-class="accordian-right-icon"></nav-slide-button>
|
||||
</div>
|
||||
|
||||
@push('scripts')
|
||||
|
||||
<script>
|
||||
|
||||
$(document).ready(function () {
|
||||
|
||||
$(".menubar-anchor").click(function() {
|
||||
if ( $(this).parent().attr('class') == 'menu-item active' ) {
|
||||
$(this).parent().removeClass('active');
|
||||
$('.arrow-icon-left').removeClass('rotate-arrow-icon');
|
||||
$('.arrow-icon-right').removeClass('rotate-arrow-icon');
|
||||
$(".sub-menubar").hide();
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
@endpush
|
||||
|
|
@ -229,6 +229,8 @@ Route::group(['middleware' => ['web', 'admin', 'admin_locale'], 'prefix' => conf
|
|||
|
||||
Route::post('slider/delete/{id}', [SliderController::class, 'destroy'])->name('admin.sliders.delete');
|
||||
|
||||
Route::post('slider/massdelete', [SliderController::class, 'massDestroy'])->name('admin.sliders.massdelete');
|
||||
|
||||
/**
|
||||
* Tax categories routes.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -172,4 +172,40 @@ class SliderController extends Controller
|
|||
|
||||
return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Slider'])], 500);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resources from database.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function massDestroy()
|
||||
{
|
||||
$suppressFlash = false;
|
||||
|
||||
if (request()->isMethod('post')) {
|
||||
$indexes = explode(',', request()->input('indexes'));
|
||||
|
||||
foreach ($indexes as $key => $value) {
|
||||
try {
|
||||
$this->sliderRepository->delete($value);
|
||||
} catch (\Exception $e) {
|
||||
$suppressFlash = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (! $suppressFlash) {
|
||||
session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', ['resource' => 'sliders']));
|
||||
} else {
|
||||
session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'sliders']));
|
||||
}
|
||||
|
||||
return redirect()->back();
|
||||
} else {
|
||||
session()->flash('error', trans('admin::app.datagrid.mass-ops.method-error'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4,7 +4,7 @@
|
|||
"/js/velocity.js": "/js/velocity.js?id=8467110c3c1ee5e363d02172acbf1a3f",
|
||||
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
|
||||
"/js/components.js": "/js/components.js?id=f536199f308a82f48041993dd85acdd3",
|
||||
"/css/velocity.css": "/css/velocity.css?id=869a81556eed304d3e19e14988d0997e",
|
||||
"/css/velocity.css": "/css/velocity.css?id=b053b024a1909003538e8ad0b63f4a30",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
|
||||
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
|
||||
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
/* large devices */
|
||||
@media only screen and (max-width: 1192px) {
|
||||
|
||||
.sticky-header {
|
||||
display: block !important;
|
||||
}
|
||||
|
|
@ -40,7 +39,7 @@
|
|||
}
|
||||
|
||||
.footer-statics {
|
||||
>div:not(:last-child) {
|
||||
> div:not(:last-child) {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
}
|
||||
|
|
@ -106,13 +105,14 @@
|
|||
padding: 0;
|
||||
width: 100%;
|
||||
background-color: $white-color;
|
||||
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
|
||||
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16),
|
||||
0 3px 6px rgba(0, 0, 0, 0.23);
|
||||
|
||||
>div {
|
||||
> div {
|
||||
display: none;
|
||||
}
|
||||
|
||||
>div.vc-small-screen {
|
||||
> div.vc-small-screen {
|
||||
display: block;
|
||||
|
||||
img {
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
text-align: right;
|
||||
height: $header-height;
|
||||
|
||||
>a {
|
||||
> a {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
@ -154,6 +154,7 @@
|
|||
z-index: 10;
|
||||
border-radius: 50%;
|
||||
position: absolute;
|
||||
color: hsla(0, 0%, 100%, 0.83);
|
||||
background: $theme-color;
|
||||
}
|
||||
}
|
||||
|
|
@ -172,7 +173,6 @@
|
|||
}
|
||||
|
||||
.product-card-new {
|
||||
|
||||
max-width: 19rem;
|
||||
|
||||
&.grid-card {
|
||||
|
|
@ -197,12 +197,11 @@
|
|||
}
|
||||
}
|
||||
|
||||
~a {
|
||||
~ a {
|
||||
position: relative;
|
||||
|
||||
&.compare-icon {
|
||||
right: 0;
|
||||
|
||||
}
|
||||
|
||||
&.wishlist-icon {
|
||||
|
|
@ -231,7 +230,6 @@
|
|||
}
|
||||
|
||||
.advertisement-three-container {
|
||||
|
||||
.top-container,
|
||||
.bottom-container {
|
||||
img {
|
||||
|
|
@ -413,7 +411,7 @@
|
|||
.selectdiv {
|
||||
display: none;
|
||||
|
||||
+div {
|
||||
+ div {
|
||||
input {
|
||||
width: calc(100% - 40px);
|
||||
border: 1px solid $theme-color;
|
||||
|
|
@ -433,14 +431,13 @@
|
|||
display: block !important;
|
||||
}
|
||||
|
||||
+.recently-viewed {
|
||||
+ .recently-viewed {
|
||||
top: 0;
|
||||
position: static;
|
||||
}
|
||||
}
|
||||
|
||||
.reviews-container {
|
||||
|
||||
.review-wrapper,
|
||||
.review-wrapper:nth-of-type(1),
|
||||
.review-wrapper:nth-last-of-type(1),
|
||||
|
|
@ -477,24 +474,23 @@
|
|||
}
|
||||
|
||||
.customer-rating {
|
||||
>.row {
|
||||
>div {
|
||||
> .row {
|
||||
> div {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.arrow {
|
||||
|
||||
&.left,
|
||||
&.right {
|
||||
display: none
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.thumb-list {
|
||||
.thumb-frame {
|
||||
>.bg-image {
|
||||
> .bg-image {
|
||||
background-size: contain;
|
||||
}
|
||||
}
|
||||
|
|
@ -502,19 +498,19 @@
|
|||
}
|
||||
|
||||
.review-page-container {
|
||||
>div {
|
||||
> div {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
>div:not(:last-child) {
|
||||
> div:not(:last-child) {
|
||||
position: relative;
|
||||
margin-bottom: 60px;
|
||||
}
|
||||
}
|
||||
|
||||
.customer-rating {
|
||||
>.row {
|
||||
>div:not(:last-child) {
|
||||
> .row {
|
||||
> div:not(:last-child) {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
}
|
||||
|
|
@ -522,11 +518,11 @@
|
|||
|
||||
.auth-content {
|
||||
&.form-container {
|
||||
>.container {
|
||||
> .container {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
|
||||
>div:first-child {
|
||||
> div:first-child {
|
||||
padding: 0;
|
||||
|
||||
.body {
|
||||
|
|
@ -548,7 +544,7 @@
|
|||
padding-left: 0px !important;
|
||||
padding-right: 0px !important;
|
||||
|
||||
>div {
|
||||
> div {
|
||||
padding: 0 10px;
|
||||
|
||||
&:first-child {
|
||||
|
|
@ -568,7 +564,7 @@
|
|||
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.21);
|
||||
|
||||
.toolbar-wrapper {
|
||||
>div.col-4 {
|
||||
> div.col-4 {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: table;
|
||||
|
|
@ -617,7 +613,7 @@
|
|||
padding-left: 10px;
|
||||
margin: 13px 0px 13px 0px;
|
||||
|
||||
>i {
|
||||
> i {
|
||||
font-size: 26px;
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
|
|
@ -644,7 +640,7 @@
|
|||
background-color: $white-color;
|
||||
border-bottom: 1px solid $border-common;
|
||||
|
||||
>i {
|
||||
> i {
|
||||
font-size: 26px;
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
|
|
@ -717,31 +713,31 @@
|
|||
display: contents;
|
||||
|
||||
&.profile::before {
|
||||
content: "\E995";
|
||||
content: '\E995';
|
||||
}
|
||||
|
||||
&.address::before {
|
||||
content: "\e949";
|
||||
content: '\e949';
|
||||
}
|
||||
|
||||
&.reviews::before {
|
||||
content: "\e97d";
|
||||
content: '\e97d';
|
||||
}
|
||||
|
||||
&.wishlist::before {
|
||||
content: "\e93e";
|
||||
content: '\e93e';
|
||||
}
|
||||
|
||||
&.compare::before {
|
||||
content: "\e93b";
|
||||
content: '\e93b';
|
||||
}
|
||||
|
||||
&.orders::before {
|
||||
content: "\e931";
|
||||
content: '\e931';
|
||||
}
|
||||
|
||||
&.downloadables::before {
|
||||
content: "\e926";
|
||||
content: '\e926';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -758,7 +754,7 @@
|
|||
width: 100%;
|
||||
display: table;
|
||||
|
||||
>* {
|
||||
> * {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
@ -822,14 +818,13 @@
|
|||
}
|
||||
|
||||
.cart-item-list {
|
||||
>div {
|
||||
> div {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.product-price {
|
||||
|
||||
span:nth-child(1),
|
||||
.special-price {
|
||||
font-size: 18px;
|
||||
|
|
@ -852,7 +847,7 @@
|
|||
padding-right: 0 !important;
|
||||
|
||||
h1,
|
||||
>div {
|
||||
> div {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
|
|
@ -868,7 +863,7 @@
|
|||
}
|
||||
|
||||
.address-holder {
|
||||
>div {
|
||||
> div {
|
||||
padding-right: 0;
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
|
|
@ -978,7 +973,7 @@
|
|||
|
||||
.main-content-wrapper {
|
||||
.vc-header {
|
||||
>div.vc-small-screen {
|
||||
> div.vc-small-screen {
|
||||
.right-vc-header {
|
||||
text-align: center;
|
||||
}
|
||||
|
|
@ -1038,4 +1033,4 @@
|
|||
min-height: 425px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,8 @@
|
|||
@extend .mb15;
|
||||
margin-left: 0px;
|
||||
|
||||
> h2, div {
|
||||
> h2,
|
||||
div {
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
|
|
@ -190,7 +191,7 @@
|
|||
.radio {
|
||||
margin-right: 10px;
|
||||
|
||||
input[type=radio] {
|
||||
input[type='radio'] {
|
||||
margin-left: 0;
|
||||
position: static;
|
||||
}
|
||||
|
|
@ -214,7 +215,7 @@
|
|||
left: 0px;
|
||||
height: 100%;
|
||||
z-index: 1001;
|
||||
opacity: 0.50;
|
||||
opacity: 0.5;
|
||||
margin-top: 5px;
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
|
|
@ -277,7 +278,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
.layouter,
|
||||
#product-form {
|
||||
height: 100%;
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
min-width: 38px;
|
||||
height: 38px;
|
||||
float: left;
|
||||
border: 1px solid #C7C7C7;
|
||||
border: 1px solid #c7c7c7;
|
||||
border-radius: 3px;
|
||||
line-height: 36px;
|
||||
text-align: center;
|
||||
|
|
@ -327,13 +327,14 @@
|
|||
img {
|
||||
width: 38px;
|
||||
height: 38px;
|
||||
border: 1px solid #C7C7C7;
|
||||
border: 1px solid #c7c7c7;
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
background: rgb(242, 242, 242);
|
||||
}
|
||||
|
||||
input:checked + span, input:checked + img {
|
||||
input:checked + span,
|
||||
input:checked + img {
|
||||
border: 1px solid #242424;
|
||||
}
|
||||
|
||||
|
|
@ -360,6 +361,11 @@
|
|||
|
||||
.description {
|
||||
overflow: auto;
|
||||
ul,
|
||||
ol {
|
||||
margin: revert;
|
||||
padding: revert;
|
||||
}
|
||||
}
|
||||
|
||||
.accordian-content {
|
||||
|
|
@ -370,6 +376,11 @@
|
|||
|
||||
.full-description {
|
||||
font-size: 14px;
|
||||
ul,
|
||||
ol {
|
||||
margin: revert;
|
||||
padding: revert;
|
||||
}
|
||||
}
|
||||
|
||||
.full-specifications {
|
||||
|
|
@ -380,7 +391,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
select[disabled=disabled] {
|
||||
select[disabled='disabled'] {
|
||||
cursor: not-allowed;
|
||||
border-color: $border-dark;
|
||||
background-color: $border-dark;
|
||||
|
|
@ -400,4 +411,3 @@
|
|||
.related-products {
|
||||
margin-bottom: 60px;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue