adeliasari
/
MIF_E31222707
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46 from FahimAnzamDip/main 

Merge Fix from Main
This commit is contained in:
Fahim Anzam Dip 2023-09-21 20:54:15 +06:00 committed by GitHub
parent 01cc347a4e 08e70a6b2c
commit 3ae9f06a6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Setting/Http/Requests/StoreSettingsRequest.php
View File

@ -22,7 +22,7 @@ class StoreSettingsRequest extends FormRequest
'company_address' => 'required|string|max:500', 'company_address' => 'required|string|max:500',
'default_currency_id' => 'required|numeric', 'default_currency_id' => 'required|numeric',
'default_currency_position' => 'required|string|max:255', 'default_currency_position' => 'required|string|max:255',
'footer_text' => 'required|string|max:255' 'footer_text' => 'nullable|string|max:255'
]; ];
} }

2
config/livewire.php
View File

@ -113,7 +113,7 @@ return [
| |
*/ */
'inject_assets' => true, 'inject_assets' => false,
/* /*
|--------------------------------------------------------------------------- |---------------------------------------------------------------------------

2
resources/views/includes/main-css.blade.php
View File

@ -10,6 +10,8 @@
@stack('page_css') @stack('page_css')
@livewireStyles
<style> <style>
div.dataTables_wrapper div.dataTables_length select { div.dataTables_wrapper div.dataTables_length select {
width: 65px; width: 65px;

2
resources/views/includes/main-js.blade.php
View File

@ -11,3 +11,5 @@
@yield('third_party_scripts') @yield('third_party_scripts')
@stack('page_scripts') @stack('page_scripts')
@livewireScripts

42
resources/views/livewire/includes/product-cart-modal.blade.php
View File

@ -1,24 +1,24 @@
<!-- Button trigger Discount Modal --> <div class="d-inline-block">
<span wire:click="$emitSelf('discountModalRefresh', '{{ $cart_item->id }}', '{{ $cart_item->rowId }}')" role="button" class="badge badge-warning pointer-event" data-toggle="modal" data-target="#discountModal{{ $cart_item->id }}"> <!-- Button trigger Discount Modal -->
<i class="bi bi-pencil-square text-white"></i> <span wire:click="$dispatch('discountModalRefresh', { product_id: {{ $cart_item->id }}, row_id: '{{ $cart_item->rowId }}' })" role="button" class="badge badge-warning pointer-event" data-toggle="modal" data-target="#discountModal{{ $cart_item->id }}">
</span> <i class="bi bi-pencil-square text-white"></i>
<!-- Discount Modal --> </span>
<div wire:ignore.self class="modal fade" id="discountModal{{ $cart_item->id }}" tabindex="-1" role="dialog" aria-labelledby="discountModalLabel" aria-hidden="true"> <!-- Discount Modal -->
<div class="modal-dialog" role="document"> <div wire:ignore.self class="modal fade" id="discountModal{{ $cart_item->id }}" tabindex="-1" role="dialog" aria-labelledby="discountModalLabel" aria-hidden="true">
<div class="modal-content"> <div class="modal-dialog" role="document">
<div class="modal-header"> <div class="modal-content">
<h5 class="modal-title" id="discountModalLabel"> <div class="modal-header">
{{ $cart_item->name }} <h5 class="modal-title" id="discountModalLabel">
<br> {{ $cart_item->name }}
<span class="badge badge-success"> <br>
<span class="badge badge-success">
{{ $cart_item->options->code }} {{ $cart_item->options->code }}
</span> </span>
</h5> </h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<form wire:submit="setProductDiscount('{{ $cart_item->rowId }}', '{{ $cart_item->id }}')" method="POST">
<div class="modal-body"> <div class="modal-body">
@if (session()->has('discount_message' . $cart_item->id)) @if (session()->has('discount_message' . $cart_item->id))
<div class="alert alert-success alert-dismissible fade show" role="alert"> <div class="alert alert-success alert-dismissible fade show" role="alert">
@ -49,9 +49,9 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Save changes</button> <button wire:click="setProductDiscount('{{ $cart_item->rowId }}', {{ $cart_item->id }})" type="button" class="btn btn-primary">Save changes</button>
</div> </div>
</form> </div>
</div> </div>
</div> </div>
</div> </div>