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

resolve the conflicts , merge master and some changes in navbar

This commit is contained in:
Deepak Singh Gusain 2022-01-25 11:33:32 +05:30
parent b5c54d4f85 858101593b
commit 64809c47b3
17 changed files with 243 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=94da304c8b02ad3ba649",
"/css/admin.css": "/css/admin.css?id=1dd9a7ca39e6a30d381b"
"/css/admin.css": "/css/admin.css?id=19c25dfc3aa8277990f0"
}

1
packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss vendored
View File

@ -67,4 +67,5 @@ $dark-mode-table-head-backgound-color: rgba(7, 30, 55,0.2);
$dark-mode-pagination-page-item-active-background-color:rgba(40, 69, 100, 0.2);
$dark-mode-pagination-page-item-active-border-color:rgba(2, 57, 83, 0.2);
$flatpickr-day-startRange-hover:rgb(5, 30, 55);
$dark-mode-pending-color: #dbb709;

32
packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss vendored
View File

@ -771,7 +771,7 @@
>a {
padding: 5px 2px;
display: block;
color: #000;
color: $black;
width: 100%;
.icon {
@ -782,7 +782,7 @@
.menu-label {
display: none;
color: #B0BEC5;
color: $menu-label-text-color;
}
.arrow-icon {
@ -792,36 +792,36 @@
&.active,
&:hover {
padding: 5px 2px;
background-color: rgba(1, 10, 20, .5);
background-color: $dark-mode-left-menubar-background-color;
}
}
&.active {
>a {
background-color: rgba(1, 10, 20, .5);
background-color: $dark-mode-left-menubar-background-color;
}
}
&:hover {
ul.sub-menubar {
background: #031425;
background: $dark-mode-left-submenubar-active-background-color;
box-shadow: none;
border: 1px solid #24384c;
border: 1px solid $dark-mode-switch-border;
.sub-menu-item {
.menu-label {
color: #fff !important;
color: $white !important;
}
&.active,
&:hover {
background-color: #020f1c;
background-color: $dark-mode-left-submenubar-background-color;
.menu-label {
color: #fff !important;
color: $white !important;
}
}
}
@ -838,7 +838,7 @@
font-size: 14px;
font-weight: 200;
display: inline-block;
color: #B0BEC5;
color: $menu-label-text-color;
}
.arrow-icon {
@ -866,25 +866,25 @@
width: calc(100% - 1px);
.menu-label {
color: #fff;
color: $white;
}
ul.sub-menubar {
display: block;
background-color: #031425;
background-color: $dark-mode-left-submenubar-active-background-color;
border: none !important;
.sub-menu-item {
.menu-label {
color: #B0BEC5;
color: $menu-label-text-color;
}
&.active,
&:hover {
background-color: rgba(1, 10, 20, .5);
background-color: $dark-mode-left-menubar-background-color;
.menu-label {
color: #fff !important;
color: $white !important;
}
}
}
@ -895,7 +895,7 @@
background: $dark-bg;
.menu-label {
color: #fff;
color: $white;
}
}
}

65
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -9,6 +9,26 @@ body {
background-color: $body-background;
}
.padding-container-navbar-not-expand{
padding-left:56px !important;
}
.padding-container-navbar-expand{
padding-left:200px !important;
}
.rtl{
.padding-container-navbar-not-expand{
padding-right:56px !important;
padding-left: 0px !important;
}
.padding-container-navbar-expand{
padding-right:200px !important;
padding-left: 0px !important;
}
}
.dark-mode-button {
background: $blue;
border: none;
@ -213,6 +233,16 @@ body {
.arrow-icon {
display: none;
}
.arrow-icon-left{
float: right;
}
.arrow-icon-right{
float: left;
margin-left: 20px;
}
}
span {
@ -465,6 +495,41 @@ body {
}
.rtl {
.navbar-left {
right: 0 !important;
ul.menubar {
li.menu-item {
ul.sub-menubar {
top: 0;
right: 56px !important;
}
}
}
&.open {
ul.menubar {
li.menu-item {
ul.sub-menubar {
li.sub-menu-item {
a {
padding-right: 52px;
padding-left: 0px;
}
}
}
}
}
}
}
.ticket-list {
.control-group {
&.has-error {

19
packages/Webkul/Admin/src/Resources/assets/sass/partials/_mobile.scss vendored
View File

@ -165,7 +165,6 @@ $toggleColor: #3c41ff;
box-shadow: 0 0 50px rgba(0, 0, 0, 0.3);
overflow-y: scroll ;
text-decoration: none;
transition: all 0.2s ease-in-out;
&::-webkit-scrollbar {
display: none;
@ -285,4 +284,22 @@ $toggleColor: #3c41ff;
.content-container{
padding-left: 0px !important;
}
.padding-container-navbar-not-expand {
padding-left: 0 !important;
}
.padding-container-navbar-expand {
padding-left: 0 !important;
}
.rtl {
.padding-container-navbar-not-expand {
padding-right: 0 !important;
}
.padding-container-navbar-expand {
padding-right: 0 !important;
}
}
}

16
packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss vendored
View File

@ -10,10 +10,17 @@
text-align: left;
.profile-info {
margin: 0 30px 0 25px;
.profile-info-div {
.profile-info-icon {
margin-right: 0px !important;
margin-left: 10px !important;
}
}
i.icon {
margin-left: 0px;
margin-left: 10px;
margin-right: 10px;
}
}
@ -24,6 +31,8 @@
border-left: 1px solid rgba(162, 162, 162, 0.2);
border-right: none;
background-color: $white;
left: 100%;
right: 0;
}
.content-container {
@ -43,7 +52,6 @@
}
.control-group {
margin-right: 20px;
margin-left: 0px;
}
}
@ -131,7 +139,7 @@
}
}
.tree-container > .tree-item {
.tree-container>.tree-item {
padding-right: 0px;
}

104
packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
View File

@ -17,82 +17,46 @@
<div class="navbar-left" v-bind:class="{'open': isMenuOpen}">
<navbar-left></navbar-left>
<ul class="menubar">
@foreach ($menu->items as $menuItem)
<li class="menu-item {{ $menu->getActive($menuItem) }}">
<a class="menubar-ancor" href="{{ $menuItem['url'] }}">
<span class="icon-menu icon {{ $menuItem['icon-class'] }}"></span>
<nav-slide-button id="nav-expand-button" icon-class="accordian-right-icon"></nav-slide-button>
</div>
<span class="menu-label">{{ trans($menuItem['name']) }}</span>
@push('scripts')
<script type="text/x-template" id="navbar-left-template">
{{-- left menu bar --}}
<ul class="menubar">
@foreach ($menu->items as $menuItem)
<li class="menu-item {{ $menu->getActive($menuItem) }}">
<a class="menubar-ancor" href="{{ $menuItem['key'] == 'dashboard' ? $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' }}"
></span>
@endif
</a>
@if ($menuItem['key'] != 'configuration')
@if (count($menuItem['children']))
<ul class="sub-menubar">
@foreach ($menuItem['children'] as $subMenuItem)
<li class="sub-menu-item {{ $menu->getActive($subMenuItem) }}">
<a href="{{ count($subMenuItem['children']) ? current($subMenuItem['children'])['url'] : $subMenuItem['url'] }}">
<span class="menu-label">{{ trans($subMenuItem['name']) }}</span>
</a>
</li>
@endforeach
</ul>
@endif
@else
@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' }}"
></span>
@endif
</a>
@if ($menuItem['key'] != 'configuration')
@if (count($menuItem['children']))
<ul class="sub-menubar">
@foreach ($config->items as $key => $item)
<li class="sub-menu-item {{ $item['key'] == request()->route('slug') ? 'active' : '' }}">
<a href="{{ route('admin.configuration.index', $item['key']) }}">
<span class="menu-label"> {{ isset($item['name']) ? trans($item['name']) : '' }}</span>
@foreach ($menuItem['children'] as $subMenuItem)
<li class="sub-menu-item {{ $menu->getActive($subMenuItem) }}">
<a href="{{ count($subMenuItem['children']) ? current($subMenuItem['children'])['url'] : $subMenuItem['url'] }}">
<span class="menu-label">{{ trans($subMenuItem['name']) }}</span>
</a>
</li>
@endforeach
</ul>
@endif
</li>
@endforeach
</ul>
</script>
@else
<ul class="sub-menubar">
@foreach ($config->items as $key => $item)
<li class="sub-menu-item {{ $item['key'] == request()->route('slug') ? 'active' : '' }}">
<a href="{{ route('admin.configuration.index', $item['key']) }}">
<span class="menu-label"> {{ isset($item['name']) ? trans($item['name']) : '' }}</span>
</a>
</li>
@endforeach
</ul>
@endif
</li>
@endforeach
</ul>
<script>
Vue.component('navbar-left', {
template: '#navbar-left-template',
data: function() {
return {
openProfileNav: 0,
openLocaleNav:0
}
},
mounted(){
$('.menu-item').click(function(){
if(! this.classList.contains('active')){
$('.menu-item').removeClass('active');
if (this.children[0].children[1].innerHTML != 'Dashboard') {
this.classList.toggle('active');
this.children[0].children[2].classList.toggle("rotate-arrow-icon");
}
}
});
},
});
</script>
@endpush
<nav-slide-button id="nav-expand-button" icon-class="accordian-right-icon"></nav-slide-button>
</div>

2
packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php
View File

@ -7,7 +7,7 @@
let config = {
relative_urls : false,
remove_script_host : true,
remove_script_host : false,
document_base_url : '{{ asset('/') }}',
uploadRoute: '{{ route('admin.tinymce.upload') }}',
csrfToken: '{{ csrf_token() }}',

55
packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php
View File

@ -43,11 +43,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -83,11 +84,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -123,11 +125,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -163,11 +166,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -203,11 +207,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">

26
packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
View File

@ -3,32 +3,32 @@
namespace Webkul\Sales\Repositories;
use Illuminate\Container\Container as App;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Webkul\Core\Eloquent\Repository;
use Webkul\Sales\Contracts\Shipment;
use Webkul\Sales\Repositories\OrderRepository;
use Webkul\Sales\Repositories\OrderItemRepository;
use Webkul\Sales\Repositories\OrderRepository;
use Webkul\Sales\Repositories\ShipmentItemRepository;
class ShipmentRepository extends Repository
{
/**
* OrderRepository object
* Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
* OrderItemRepository object
* Order item repository instance.
*
* @var \Webkul\Sales\Repositories\OrderItemRepository
*/
protected $orderItemRepository;
/**
* ShipmentItemRepository object
* Shipment item repository instance.
*
* @var \Webkul\Sales\Repositories\ShipmentItemRepository
*/
@ -47,8 +47,7 @@ class ShipmentRepository extends Repository
OrderItemRepository $orderItemRepository,
ShipmentItemRepository $shipmentItemRepository,
App $app
)
{
) {
$this->orderRepository = $orderRepository;
$this->orderItemRepository = $orderItemRepository;
@ -59,16 +58,18 @@ class ShipmentRepository extends Repository
}
/**
* Specify Model class name
* Specify model class name.
*
* @return string
*/
function model()
public function model()
{
return Shipment::class;
}
/**
* Create.
*
* @param array $data
* @param string $orderState
* @return \Webkul\Sales\Contracts\Shipment
@ -85,6 +86,7 @@ class ShipmentRepository extends Repository
$shipment = $this->model->create([
'order_id' => $order->id,
'total_qty' => 0,
'total_weight' => 0,
'carrier_title' => $data['shipment']['carrier_title'],
'track_number' => $data['shipment']['track_number'],
'customer_id' => $order->customer_id,
@ -93,7 +95,7 @@ class ShipmentRepository extends Repository
'inventory_source_id' => $data['shipment']['source'],
]);
$totalQty = 0;
$totalQty = $totalWeight = 0;
foreach ($data['shipment']['items'] as $itemId => $inventorySource) {
$qty = $inventorySource[$data['shipment']['source']];
@ -105,8 +107,9 @@ class ShipmentRepository extends Repository
}
$totalQty += $qty;
$totalWeight += $orderItem->weight * $qty;
$shipmentItem = $this->shipmentItemRepository->create([
$this->shipmentItemRepository->create([
'shipment_id' => $shipment->id,
'order_item_id' => $orderItem->id,
'name' => $orderItem->name,
@ -153,6 +156,7 @@ class ShipmentRepository extends Repository
$shipment->update([
'total_qty' => $totalQty,
'total_weight' => $totalWeight,
'inventory_source_name' => $shipment->inventory_source->name,
]);

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=9d5b79be5419c0a5c1bc",
"/css/shop.css": "/css/shop.css?id=547e2e10c32ca9fd4028"
"/css/shop.css": "/css/shop.css?id=34b435fc92b3747c69ee"
}

17
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -617,6 +617,13 @@ input {
.product-card {
font-size: 90%;
.product-information{
.default-wrap{
display: block;
height: 40px;
}
}
.product-image {
img {
display: block;
@ -629,6 +636,15 @@ input {
}
}
.btn-primary{
width: 100%;
}
.btn-lg{
padding: 4px 12px;
margin-bottom: 10px;
}
.product-grid-4 {
grid-template-columns: 48.5% 48.5%;
grid-column-gap: 10px;
@ -3402,7 +3418,6 @@ section.review {
.product-name,
.product-price {
max-width: 280px;
margin-left: auto;
margin-right: auto;
word-break: break-all;
}

1
packages/Webkul/Velocity/publishable/assets/js/jquery-ez-plus.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -27,49 +27,51 @@
<div class="reviews-container">
@if (! $reviews->isEmpty())
@foreach ($reviews as $review)
<div class="row col-12 fs16">
<div class="col-12 row">
<div class="col-12 lg-card-container list-card product-card row">
<div class="product-image">
@php
$image = productimage()->getProductBaseImage($review->product);
@endphp
<a
href="{{ url()->to('/').'/'.$review->product->url_key }}"
title="{{ $review->product->name }}"
class="col-2 max-sm-img-dimention no-padding">
<img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
</a>
href="{{ url()->to('/').'/'.$review->product->url_key }}">
<div class="col-8">
<img src="{{ $image['small_image_url'] }}" title="{{ $review->product->name }}">
</a>
</div>
<div class="product-information">
<div class="d-flex justify-content-between">
<div class="product-name">
<a
class="remove-decoration"
href="{{ url()->to('/').'/'.$review->product->url_key }}"
title="{{ $review->product->name }}">
{{$review->product->name}}
title="{{ $review->product->name }}" class="unset">
<span class="fs16">{{ $review->product->name }}</span>
</a>
</div>
<star-ratings ratings="{{ $review->rating }}"></star-ratings>
<star-ratings ratings="{{ $review->rating }}"></star-ratings>
<h5 class="fw6" v-pre>{{ $review->title }}</h5>
<h5 class="fw6" v-pre>{{ $review->title }}</h5>
<p v-pre>{{ $review->comment }}</p>
</div>
<p v-pre>{{ $review->comment }}</p>
</div>
<div class="col-2">
<form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
@method('delete')
@csrf
</form>
<div>
<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>
</div>
<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>
</div>
</div>
</div>
</div>
@endforeach
<div class="bottom-toolbar">
@ -119,4 +121,4 @@
})
})()
</script>
@endpush
@endpush

2
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -218,7 +218,7 @@
@push('scripts')
<script type="text/javascript" src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}"></script>
<script type="text/javascript" src="{{ asset('themes/velocity/assets/js/jquery.ez-plus.js') }}"></script>
<script type="text/javascript" src="{{ asset('themes/velocity/assets/js/jquery-ez-plus.js') }}"></script>
<script type='text/javascript' src='https://unpkg.com/spritespin@4.1.0/release/spritespin.js'></script>