NW/FleetCart
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

¨4.0.1¨

Browse Source
This commit is contained in:
¨NW¨
2023-12-03 14:07:47 +00:00
parent c08b36d1b6
commit f35052522d
1112 changed files with 43019 additions and 24987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Themes/Storefront/views/public/checkout/create/form/billing_details.blade.php
View File

@@ -1,33 +1,40 @@
<div class="billing-details">
<h4 class="section-title">{{ trans('storefront::checkout.billing_details') }}</h4>
<div class="select-address" v-if="hasAddress" v-cloak>
<div class="form-group">
<div class="form-radio" v-for="address in addresses">
<input type="radio" v-model="form.billingAddressId" :value="address.id"
:id="'billing-address-' + address.id">
<label :for="'billing-address-' + address.id">
<span v-text="address.full_name"></span>
<span v-text="address.address_1"></span>
<span v-if="address.address_2" v-text="address.address_2"></span>
<span>@{{ address.city }}, @{{ address.state_name }} @{{ address.zip }}</span>
<span v-text="address.country_name"></span>
</label>
<div class="address-card-wrap" v-if="hasAddress" v-cloak>
<div class="row">
<div class="col d-flex" v-for="address in addresses" :key="address.id">
<address
class="address-card"
:class="{ active: form.billingAddressId === address.id }"
@click="changeBillingAddress(address)"
>
<span class="badge" v-if="defaultAddress.address_id === address.id">
{{ trans('storefront::checkout.default') }}
</span>
<div class="address-card-data">
<span v-text="address.full_name"></span>
<span v-text="address.address_1"></span>
<span v-if="address.address_2" v-text="address.address_2"></span>
<span>@{{ address.city }}, @{{ address.state_name }} @{{ address.zip }}</span>
<span v-text="address.country_name"></span>
</div>
</address>
</div>
<span class="error-message" v-if="! form.newBillingAddress && errors.has('billing.address_1')">
{{ trans('storefront::checkout.you_must_select_an_address') }}
</span>
</div>
<span class="error-message" v-if="!form.newBillingAddress && errors.has('billing.address_1')">
{{ trans('storefront::checkout.you_must_select_an_address') }}
</span>
</div>
<div class="add-new-address-wrap" v-cloak>
<button v-if="hasAddress" type="button" class="btn btn-add-new-address" @click="addNewBillingAddress">
{{ trans('storefront::checkout.add_new_address') }}
@{{ form.newBillingAddress ? '-' : '+'}} {{ trans('storefront::checkout.add_new_address') }}
</button>
<div class="add-new-address-form" v-show="! hasAddress || form.newBillingAddress">
<div class="add-new-address-form" v-show="!hasAddress || form.newBillingAddress">
<div class="row">
<div class="col-md-9">
<div class="form-group">
@@ -136,7 +143,7 @@
</label>
<input type="text" name="billing[state]" id="billing-state" class="form-control"
v-if="! hasBillingStates" v-model="form.billing.state">
v-if="!hasBillingStates" v-model="form.billing.state">
<select name="billing[state]" id="billing-state" class="form-control arrow-black"
@change="changeBillingState($event.target.value)" v-else>

52
Themes/Storefront/views/public/checkout/create/form/shipping_details.blade.php
View File

@@ -15,35 +15,41 @@
<div class="ship-to-different-address-form" v-show="form.ship_to_a_different_address" v-cloak>
<h4 class="section-title">{{ trans('storefront::checkout.shipping_details') }}</h4>
<div class="select-address" v-if="hasAddress">
<div class="form-group">
<div class="form-radio" v-for="address in addresses">
<input type="radio" v-model="form.shippingAddressId" :value="address.id"
:id="'shipping-address-' + address.id">
<label :for="'shipping-address-' + address.id">
<span v-text="address.full_name"></span>
<span v-text="address.address_1"></span>
<span v-if="address.address_2" v-text="address.address_2"></span>
<span>@{{ address.city }}, @{{ address.state_name }} @{{ address.zip }}</span>
<span v-text="address.country_name"></span>
</label>
<div class="address-card-wrap" v-if="hasAddress">
<div class="row">
<div class="col d-flex" v-for="address in addresses" :key="address.id">
<address
class="address-card"
:class="{ active: form.shippingAddressId === address.id }"
@click="changeShippingAddress(address)"
>
<span class="badge" v-if="defaultAddress.address_id === address.id">
{{ trans('storefront::checkout.default') }}
</span>
<div class="address-card-data">
<span v-text="address.full_name"></span>
<span v-text="address.address_1"></span>
<span v-if="address.address_2" v-text="address.address_2"></span>
<span>@{{ address.city }}, @{{ address.state_name }} @{{ address.zip }}</span>
<span v-text="address.country_name"></span>
</div>
</address>
</div>
<span class="error-message"
v-if="! form.newShippingAddress && errors.has('shipping.address_1')">
{{ trans('storefront::checkout.you_must_select_an_address') }}
</span>
</div>
</div>
<div class="add-new-address-wrap">
<button v-if="hasAddress" type="button" class="btn btn-add-new-address"
@click="addNewShippingAddress">
{{ trans('storefront::checkout.add_new_address') }}
<button
v-if="hasAddress"
type="button"
class="btn btn-add-new-address"
@click="addNewShippingAddress"
>
@{{ form.newShippingAddress ? '-' : '+'}} {{ trans('storefront::checkout.add_new_address') }}
</button>
<div class="add-new-address-form" v-show="! hasAddress || form.newShippingAddress">
<div class="add-new-address-form" v-show="!hasAddress || form.newShippingAddress">
<div class="row">
<div class="col-md-9">
<div class="form-group">
@@ -159,7 +165,7 @@
</label>
<input type="text" name="shipping[state]" id="shipping-state"
class="form-control" v-if="! hasShippingStates"
class="form-control" v-if="!hasShippingStates"
v-model="form.shipping.state">
<select name="shipping[state]" id="shipping-state"