finishing to dev
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 3m41s
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 16s
Build, Push and Deploy / deploy-staging (push) Successful in 42s
Build, Push and Deploy / deploy-production (push) Has been skipped

This commit is contained in:
2026-05-14 22:50:44 +07:00
parent 2fabdf8fc9
commit 8307b9e66d
212 changed files with 2451 additions and 4493 deletions

View File

@@ -5,6 +5,13 @@
@endsection
@php
$file = base_path('lang/countrylist.json');
if (file_exists($file)) {
$countries = json_decode(file_get_contents($file), true);
} else {
$countries = [];
}
$type = request('type') !== 'Supplier' ? 'Customer' : 'Supplier';
@endphp
@@ -42,7 +49,7 @@ class="ajaxform_instant_reload">
<div class="col-lg-6 mb-2">
<label>{{ __('Phone') }}</label>
<input type="text" value="{{ $party->phone }}" name="phone"
<input type="number" value="{{ $party->phone }}" name="phone"
class="form-control" placeholder="{{ __('Enter phone number') }}">
</div>
@@ -70,8 +77,7 @@ class="form-control" placeholder="{{ __('Enter phone number') }}">
@endif
@php
$branch_id = auth()->user()->branch_id ?? auth()->user()->active_branch_id ?? null;
$branch_logic = $party->branch_id != $branch_id;
$branch_logic = $party->branch_id != (auth()->user()->active_branch?->id);
@endphp
<div class="col-lg-6 mb-2">
@@ -110,11 +116,6 @@ class="form-control" placeholder="{{ __('Enter Email') }}">
class="form-control" placeholder="{{ __('Enter Address') }}">
</div>
<div class="col-lg-6 mb-2">
<label>{{ __('Tax No') }}</label>
<input type="text" value="{{ $party->tax_no }}" name="tax_no" class="form-control" placeholder="{{ __('Enter tax') }}">
</div>
<div class="accordion" id="customAccordion">
<div class="accordion-item border-0">
<h2 class="accordion-header">
@@ -130,22 +131,12 @@ class="accordion-button address-accordion collapsed fw-medium text-primary bg-t
data-bs-parent="#customAccordion">
<div class="accordion-body fst-italic text-secondary p-0">
<div class="row">
<div class="col-lg-6 mb-2">
<label>{{ __('Country') }}</label>
<select name="country_id" id="country_id" class="form-control">
<option value="">{{ __('Select a country') }}</option>
@foreach ($countries as $country)
<option value="{{ $country->id }}" @selected(($party->country_id ?? '') == $country->id)>{{ __($country->name) }}</option>
@endforeach
</select>
</div>
<div class="col-lg-6 mb-2">
<label>{{ __('State') }}</label>
<select name="state_id" id="state_id" class="form-control" data-selected="{{ $party->state_id ?? '' }}">
<option value="">{{ __('Select state') }}</option>
</select>
<label>{{ __('Address') }}</label>
<input type="text" name="billing_address[address]"
value="{{ $party->billing_address['address'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter address') }}">
</div>
<div class="col-lg-6 mb-2">
@@ -156,6 +147,14 @@ class="form-control"
placeholder="{{ __('Enter city') }}">
</div>
<div class="col-lg-6 mb-2">
<label>{{ __('State') }}</label>
<input type="text" name="billing_address[state]"
value="{{ $party->billing_address['state'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter state') }}">
</div>
<div class="col-lg-6 mb-2">
<label>{{ __('Zip Code') }}</label>
<input type="text" name="billing_address[zip_code]"
@@ -164,18 +163,24 @@ class="form-control"
placeholder="{{ __('Enter zip code') }}">
</div>
<div class="col-lg-6 mb-2">
<label>{{ __('Address') }}</label>
<input type="text" name="billing_address[address]"
value="{{ $party->billing_address['address'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter address') }}">
</div>
@php
$billing = is_array($party->billing_address) ? $party->billing_address : json_decode($party->billing_address, true) ?? [];
@endphp
<div class="col-lg-6 mb-2">
<label>{{ __('Country') }}</label>
<select name="billing_address[country]"
class="form-control">
<option value="">{{ __('Select a country') }}
</option>
@foreach ($countries as $country)
<option value="{{ $country['name'] }}"
@selected(($billing['country'] ?? '') == $country['name'])>
{{ __($country['name']) }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
@@ -199,7 +204,7 @@ class="accordion-button address-accordion fw-medium text-dark bg-transparent sha
<div class="col-lg-6 mb-2">
<label>{{ __('Address') }}</label>
<input type="text" name="shipping_address[address]"
value="{{ $party->shipping_address['address'] ?? '' }}"
value="{{ $party->billing_address['address'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter address') }}">
</div>
@@ -207,7 +212,7 @@ class="form-control"
<div class="col-lg-6 mb-2">
<label>{{ __('City') }}</label>
<input type="text" name="shipping_address[city]"
value="{{ $party->shipping_address['city'] ?? '' }}"
value="{{ $party->billing_address['city'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter city') }}">
</div>
@@ -215,7 +220,7 @@ class="form-control"
<div class="col-lg-6 mb-2">
<label>{{ __('State') }}</label>
<input type="text" name="shipping_address[state]"
value="{{ $party->shipping_address['state'] ?? '' }}"
value="{{ $party->billing_address['state'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter state') }}">
</div>
@@ -223,7 +228,7 @@ class="form-control"
<div class="col-lg-6 mb-2">
<label>{{ __('Zip Code') }}</label>
<input type="text" name="shipping_address[zip_code]"
value="{{ $party->shipping_address['zip_code'] ?? '' }}"
value="{{ $party->billing_address['zip_code'] ?? '' }}"
class="form-control"
placeholder="{{ __('Enter zip code') }}">
</div>
@@ -260,7 +265,7 @@ class="form-control">
<img src="{{ asset( $party->image ?? 'assets/images/icons/img.png') }}" alt="icon" />
</div>
<p>{{__('Drag & drop your Image')}}</p>
<p>{{__('or')}} <span class="browse-text">{{__('Browse')}}</span></p>
<p>or <span class="browse-text">{{__('Browse')}}</span></p>
</div>
</div>
@@ -285,6 +290,5 @@ class="theme-btn border-btn m-2">{{ __('Cancel') }}</a>
</div>
</div>
</div>
<input type="hidden" value="{{ route('business.get-states.index') }}" id="get-state">
</div>
@endsection