From 36cb09bc58e44f72ed472db859a3d4555f7ecc1b Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 15 Feb 2019 20:10:47 +0530
Subject: [PATCH] address while checkout & reduces code

---
 packages/Webkul/Checkout/src/Cart.php         |  18 +-
 .../Shop/src/Resources/assets/sass/app.scss   |  18 +
 .../Webkul/Shop/src/Resources/lang/en/app.php |   3 +-
 .../views/checkout/onepage.blade.php          |  40 +-
 .../checkout/onepage/customer-info.blade.php  | 989 ++++++------------
 5 files changed, 417 insertions(+), 651 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index e11c3ecc5..c12df3a5f 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -629,7 +629,7 @@ class Cart {
         $shippingAddress = $data['shipping'];
         $billingAddress['cart_id'] = $shippingAddress['cart_id'] = $cart->id;
 
-        if (isset($data['billing']['address_id'])) {
+        if (isset($data['billing']['address_id']) && $data['billing']['address_id']) {
             $address = $this->customerAddress->findOneWhere(['id'=> $data['billing']['address_id']])->toArray();
             $billingAddress['first_name'] = auth()->guard('customer')->user()->first_name;
             $billingAddress['last_name'] = auth()->guard('customer')->user()->last_name;
@@ -643,7 +643,7 @@ class Cart {
             $billingAddress['phone'] = $address['phone'];
         }
 
-        if (isset($data['shipping']['address_id'])) {
+        if (isset($data['shipping']['address_id']) && $data['shipping']['address_id']) {
             $address = $this->customerAddress->findOneWhere(['id'=> $data['shipping']['address_id']])->toArray();
             $shippingAddress['first_name'] = auth()->guard('customer')->user()->first_name;
             $shippingAddress['last_name'] = auth()->guard('customer')->user()->last_name;
@@ -657,11 +657,15 @@ class Cart {
             $shippingAddress['phone'] = $address['phone'];
         }
 
-        // if (auth()->guard('customer')->check()) {
-        //     if ($data['billing']['use_for_shipping'] == true) {
-        //         $shippingAddress = $billingAddress;
-        //     }
-        // }
+        if (isset($data['billing']['save_as_address']) && $data['billing']['save_as_address']) {
+            $billingAddress['customer_id']  = auth()->guard('customer')->user()->id;
+            $this->customerAddress->create($billingAddress);
+        }
+
+        if (isset($data['shipping']['save_as_address']) && $data['shipping']['save_as_address']) {
+            $shippingAddress['customer_id']  = auth()->guard('customer')->user()->id;
+            $this->customerAddress->create($shippingAddress);
+        }
 
         if ($billingAddressModel = $cart->billing_address) {
             $this->cartAddress->update($billingAddress, $billingAddressModel->id);
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index b8c522a9b..3b059f034 100755
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -2493,6 +2493,24 @@ section.cart {
                     }
                 }
             }
+
+            .address-holder {
+                justify-content: space-between;
+
+                .address-card-1 {
+                    margin-right: 0px !important;
+                    width: 253px !important;
+
+                    .details {
+                        margin-left: 30px;
+
+                        .checkmark {
+                            left: -30px;
+                            top: 12px;
+                        }
+                    }
+                }
+            }
             // complete page end here
         }
     }
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index ee8f5c9c8..9ab227503 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -422,7 +422,8 @@ return [
             'shipping-address' => 'Shipping Address',
             'contact' => 'Contact',
             'place-order' => 'Place Order',
-            'new-address' => 'Add New Address'
+            'new-address' => 'Add New Address',
+            'save_as_address' => 'Save as Address'
         ],
 
         'total' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index 86d9fec57..d4acc9104 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -117,6 +117,16 @@
         var paymentHtml = '';
         var reviewHtml = '';
         var summaryHtml = Vue.compile(`<?php echo view('shop::checkout.total.summary', ['cart' => $cart])->render(); ?>`);
+        var customerAddress = null;
+
+        @auth('customer')
+            @if(auth('customer')->user()->addresses)
+                customerAddress = @json(auth('customer')->user()->addresses);
+                customerAddress.email = "{{ auth('customer')->user()->email }}";
+                customerAddress.first_name = "{{ auth('customer')->user()->first_name }}";
+                customerAddress.last_name = "{{ auth('customer')->user()->last_name }}";
+            @endif
+        @endauth
 
         Vue.component('checkout', {
 
@@ -147,9 +157,37 @@
 
                 new_billing_address: false,
 
-                countryStates: @json(core()->groupedStatesByCountries())
+                allAddress: {},
+
+                countryStates: @json(core()->groupedStatesByCountries()),
+
+                country: @json(core()->countries())
             }),
 
+            created() {
+                if(!customerAddress) {
+                    this.new_shipping_address = true;
+                    this.new_billing_address = true;
+                } else {
+                    if (customerAddress.length < 1) {
+                        this.new_shipping_address = true;
+                        this.new_billing_address = true;
+                    } else {
+                        this.allAddress = customerAddress;
+
+                        for (var country in this.country) {
+                            for (var code in this.allAddress) {
+                                if (this.allAddress[code].country) {
+                                    if (this.allAddress[code].country == this.country[country].code) {
+                                        this.allAddress[code]['country'] = this.country[country].name;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+
             methods: {
                 navigateToStep (step) {
                     if (step <= this.completedStep) {
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index b9fc8113f..4b344de8d 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -1,697 +1,402 @@
 <form data-vv-scope="address-form">
-    <?php
-        $enableMultiAddress = false;
 
-        if(auth()->guard('customer')->check()) {
-            $addresses = auth()->guard('customer')->user()->addresses;
+    <div class="form-container" v-if="!this.new_billing_address">
+        <div class="form-header mb-20">
+            <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
 
-            if(isset($addresses) && count($addresses)) {
-                $enableMultiAddress = true;
-            }
-        }
-    ?>
+            <a class="btn btn-lg btn-primary" @click = newBillingAddress()>
+                {{ __('shop::app.checkout.onepage.new-address') }}
+            </a>
+        </div>
+        <div class="address-holder">
+            <div class="address-card-1" v-for='(addresses, index) in this.allAddress'>
+                <div class="details">
 
-    @if ($enableMultiAddress)
-        <div class="form-container" v-if="!this.new_billing_address">
-            <div class="form-header mb-20">
-                <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
+                    <label class="radio-container">
+                        <input type="radio" v-validate="'required'" id="billing[address_id]" name="billing[address_id]" :value="addresses.id" v-model="address.billing.address_id" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;">
+                        <span class="checkmark"></span>
+                    </label>
 
-                <a class="btn btn-lg btn-primary" @click = newBillingAddress()>
-                    {{ __('shop::app.checkout.onepage.new-address') }}
-                </a>
-            </div>
-            <div class="address-holder">
-                @foreach ($addresses as $address)
-                    <div class="address-card-1">
-                        <div class="details" style="margin-left: 20px">
-
-                            <label class="radio-container">
-                                <input type="radio" v-validate="'required'" id="billing[address_id]" name="billing[address_id]" v-model="address.billing.address_id" value="{{ $address->id }}" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.billing-address') }}&quot;"  style="border: 1px solid black;" >
-                                <span class="checkmark" style="left: -20px;
-                                top: 12px;"></span>
-                            </label>
-
-                            <span class="bold">{{ auth()->guard('customer')->user()->name }}</span>
-                            {{ $address->name }}</br>
-                            {{ $address->address1 }}, {{ $address->address2 ? $address->address2 . ',' : '' }}</br>
-                            {{ $address->city }}</br>
-                            {{ $address->state }}</br>
-                            {{ country()->name($address->country) }} {{ $address->postcode }}</br></br>
-                            {{ __('shop::app.customer.account.address.index.contact') }} : {{ $address->phone }}
-                        </div>
-                    </div>
-                @endforeach
-
-                <div class="control-group" :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
-                    <span class="control-error" v-if="errors.has('address-form.billing[address_id]')">
-                        @{{ errors.first('address-form.billing[address_id]') }}
-                    </span>
+                    <span class="bold"> @{{ allAddress.first_name }} @{{ allAddress.last_name }}</span>
+                    @{{ addresses.name }}</br>
+                    @{{ addresses.address1 }}, @{{ addresses.address2 }} </br>
+                    @{{ addresses.city }}<br>
+                    @{{ addresses.state }}<br>
+                    @{{ addresses.country }}</br></br>
+                    {{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
                 </div>
-
             </div>
-            <div class="control-group">
-                <span class="checkbox">
-                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
-                        <label class="checkbox-view" for="billing[use_for_shipping]"></label>
-                        {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+            <div class="control-group" :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
+                <span class="control-error" v-if="errors.has('address-form.billing[address_id]')">
+                    @{{ errors.first('address-form.billing[address_id]') }}
                 </span>
-
             </div>
         </div>
-
-        <div class="form-container" v-if="this.new_billing_address">
-
-            <div class="form-header">
-                <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
-
-                @guest('customer')
-                    <a class="btn btn-lg btn-primary">
-                        {{ __('shop::app.checkout.onepage.sign-in') }}
-                    </a>
-                @endguest
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
-                <label for="billing[first_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.first-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="address.billing.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
-                    @{{ errors.first('address-form.billing[first_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[last_name]') ? 'has-error' : '']">
-                <label for="billing[last_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.last-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="address.billing.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
-                    @{{ errors.first('address-form.billing[last_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
-                <label for="billing[email]" class="required">
-                    {{ __('shop::app.checkout.onepage.email') }}
-                </label>
-
-                <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[email]')">
-                    @{{ errors.first('address-form.billing[email]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[address1]') ? 'has-error' : '']">
-                <label for="billing[address1]" class="required">
-                    {{ __('shop::app.checkout.onepage.address1') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[address1]" name="billing[address1]" v-model="address.billing.address1" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[address1]')">
-                    @{{ errors.first('address-form.billing[address1]') }}
-                </span>
-            </div>
-
-            <div class="control-group">
-                <label for="billing[address2]">
-                    {{ __('shop::app.checkout.onepage.address2') }}
-                </label>
-
-                <input type="text" class="control" id="billing[address2]" name="billing[address2]" v-model="address.billing.address2"/>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[city]') ? 'has-error' : '']">
-                <label for="billing[city]" class="required">
-                    {{ __('shop::app.checkout.onepage.city') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="address.billing.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[city]')">
-                    @{{ errors.first('address-form.billing[city]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[state]') ? 'has-error' : '']">
-                <label for="billing[state]" class="required">
-                    {{ __('shop::app.checkout.onepage.state') }}
-                </label>
-
-
-                <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="!haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-                <select v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-                    <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-                    <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
-                        @{{ state.default_name }}
-                    </option>
-
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[state]')">
-                    @{{ errors.first('address-form.billing[state]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[postcode]') ? 'has-error' : '']">
-                <label for="billing[postcode]" class="required">
-                    {{ __('shop::app.checkout.onepage.postcode') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="address.billing.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
-                    @{{ errors.first('address-form.billing[postcode]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
-                <label for="billing[country]" class="required">
-                    {{ __('shop::app.checkout.onepage.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                    <option value=""></option>
-
-                    @foreach (core()->countries() as $country)
-
-                        <option value="{{ $country->code }}">{{ $country->name }}</option>
-
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[country]')">
-                    @{{ errors.first('address-form.billing[country]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[phone]') ? 'has-error' : '']">
-                <label for="billing[phone]" class="required">
-                    {{ __('shop::app.checkout.onepage.phone') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="address.billing.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
-                    @{{ errors.first('address-form.billing[phone]') }}
-                </span>
-            </div>
-
-            <div class="control-group">
-                <span class="checkbox">
-                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
+        <div class="control-group">
+            <span class="checkbox">
+                <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
                     <label class="checkbox-view" for="billing[use_for_shipping]"></label>
                     {{ __('shop::app.checkout.onepage.use_for_shipping') }}
-                </span>
+            </span>
 
-            </div>
         </div>
+    </div>
 
-        <div class="form-container" v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
-            <div class="form-header">
-                <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
+    <div class="form-container" v-if="this.new_billing_address">
 
-                <a class="btn btn-lg btn-primary" @click=newShippingAddress()>
-                    {{ __('shop::app.checkout.onepage.new-address') }}
+        <div class="form-header">
+            <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
+
+            @guest('customer')
+                <a class="btn btn-lg btn-primary" href="{{ route('customer.session.index') }}">
+                    {{ __('shop::app.checkout.onepage.sign-in') }}
                 </a>
-            </div>
-            <div class="address-holder">
-                @foreach ($addresses as $address)
-                    <div class="address-card-1">
-                        <div class="details" style="margin-left: 20px">
+            @endguest
+        </div>
 
-                            <label class="radio-container">
-                                <input v-validate="'required'" type="radio" id="shipping[address_id]" name="shipping[address_id]" v-model="address.shipping.address_id" value="{{ $address->id }}"
-                                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;"  style="border: 1px solid black;">
-                                <span class="checkmark" style="left: -20px;
-                                top: 12px;"></span>
-                            </label>
+        <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
+            <label for="billing[first_name]" class="required">
+                {{ __('shop::app.checkout.onepage.first-name') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="address.billing.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
+                @{{ errors.first('address-form.billing[first_name]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[last_name]') ? 'has-error' : '']">
+            <label for="billing[last_name]" class="required">
+                {{ __('shop::app.checkout.onepage.last-name') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="address.billing.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
+                @{{ errors.first('address-form.billing[last_name]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
+            <label for="billing[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}
+            </label>
+
+            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
+                @{{ errors.first('address-form.billing[email]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[address1]') ? 'has-error' : '']">
+            <label for="billing[address1]" class="required">
+                {{ __('shop::app.checkout.onepage.address1') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[address1]" name="billing[address1]" v-model="address.billing.address1" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[address1]')">
+                @{{ errors.first('address-form.billing[address1]') }}
+            </span>
+        </div>
+
+        <div class="control-group">
+            <label for="billing[address2]">
+                {{ __('shop::app.checkout.onepage.address2') }}
+            </label>
+
+            <input type="text" class="control" id="billing[address2]" name="billing[address2]" v-model="address.billing.address2"/>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[city]') ? 'has-error' : '']">
+            <label for="billing[city]" class="required">
+                {{ __('shop::app.checkout.onepage.city') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="address.billing.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[city]')">
+                @{{ errors.first('address-form.billing[city]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[state]') ? 'has-error' : '']">
+            <label for="billing[state]" class="required">
+                {{ __('shop::app.checkout.onepage.state') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="!haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
+
+            <select v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+
+                <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
+
+                <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
+                    @{{ state.default_name }}
+                </option>
+
+            </select>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[state]')">
+                @{{ errors.first('address-form.billing[state]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[postcode]') ? 'has-error' : '']">
+            <label for="billing[postcode]" class="required">
+                {{ __('shop::app.checkout.onepage.postcode') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="address.billing.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
+                @{{ errors.first('address-form.billing[postcode]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
+            <label for="billing[country]" class="required">
+                {{ __('shop::app.checkout.onepage.country') }}
+            </label>
+
+            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+                <option value=""></option>
+
+                @foreach (core()->countries() as $country)
+
+                    <option value="{{ $country->code }}">{{ $country->name }}</option>
 
-                            <span class="bold">{{ auth()->guard('customer')->user()->name }}</span>
-                            {{ $address->name }}</br>
-                            {{ $address->address1 }}, {{ $address->address2 ? $address->address2 . ',' : '' }}</br>
-                            {{ $address->city }}</br>
-                            {{ $address->state }}</br>
-                            {{ country()->name($address->country) }} {{ $address->postcode }}</br></br>
-                            {{ __('shop::app.customer.account.address.index.contact') }} : {{ $address->phone }}
-                        </div>
-                    </div>
                 @endforeach
+            </select>
 
-                <div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
-                    <span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
-                        @{{ errors.first('address-form.shipping[address_id]') }}
-                    </span>
-                </div>
-
-            </div>
+            <span class="control-error" v-if="errors.has('address-form.billing[country]')">
+                @{{ errors.first('address-form.billing[country]') }}
+            </span>
         </div>
 
-        <div class="form-container" v-if="!address.billing.use_for_shipping && this.new_shipping_address">
+        <div class="control-group" :class="[errors.has('address-form.billing[phone]') ? 'has-error' : '']">
+            <label for="billing[phone]" class="required">
+                {{ __('shop::app.checkout.onepage.phone') }}
+            </label>
 
-            <div class="form-header">
-                <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
-            </div>
+            <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="address.billing.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
-                <label for="shipping[first_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.first-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
-                    @{{ errors.first('address-form.shipping[first_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[last_name]') ? 'has-error' : '']">
-                <label for="shipping[last_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.last-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
-                    @{{ errors.first('address-form.shipping[last_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[email]') ? 'has-error' : '']">
-                <label for="shipping[email]" class="required">
-                    {{ __('shop::app.checkout.onepage.email') }}
-                </label>
-
-                <input type="text" v-validate="'required|email'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
-                    @{{ errors.first('address-form.shipping[email]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[address1]') ? 'has-error' : '']">
-                <label for="shipping[address1]" class="required">
-                    {{ __('shop::app.checkout.onepage.address1') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[address1]" name="shipping[address1]" v-model="address.shipping.address1" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[address1]')">
-                    @{{ errors.first('address-form.shipping[address1]') }}
-                </span>
-            </div>
-
-            <div class="control-group">
-                <label for="shipping[address2]">
-                    {{ __('shop::app.checkout.onepage.address2') }}
-                </label>
-
-                <input type="text" class="control" id="shipping[address2]" name="shipping[address2]" v-model="address.shipping.address2"/>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
-                <label for="shipping[city]" class="required">
-                    {{ __('shop::app.checkout.onepage.city') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
-                    @{{ errors.first('address-form.shipping[city]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
-                <label for="shipping[state]" class="required">
-                    {{ __('shop::app.checkout.onepage.state') }}
-                </label>
-
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="!haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-                <select v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-                    <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-                    <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
-                        @{{ state.default_name }}
-                    </option>
-
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
-                    @{{ errors.first('address-form.shipping[state]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[postcode]') ? 'has-error' : '']">
-                <label for="shipping[postcode]" class="required">
-                    {{ __('shop::app.checkout.onepage.postcode') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
-                    @{{ errors.first('address-form.shipping[postcode]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
-                <label for="shipping[country]" class="required">
-                    {{ __('shop::app.checkout.onepage.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                    <option value=""></option>
-
-                    @foreach (core()->countries() as $country)
-                        <option value="{{ $country->code }}">{{ $country->name }}</option>
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
-                    @{{ errors.first('address-form.shipping[country]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
-                <label for="shipping[phone]" class="required">
-                    {{ __('shop::app.checkout.onepage.phone') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
-                    @{{ errors.first('address-form.shipping[phone]') }}
-                </span>
-            </div>
+            <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
+                @{{ errors.first('address-form.billing[phone]') }}
+            </span>
         </div>
-    @else
-        <div class="form-container">
 
-            <div class="form-header">
-                <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
+        <div class="control-group">
+            <span class="checkbox">
+                <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
+                <label class="checkbox-view" for="billing[use_for_shipping]"></label>
+                {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+            </span>
 
-                @guest('customer')
-                    <a class="btn btn-lg btn-primary">
-                        {{ __('shop::app.checkout.onepage.sign-in') }}
-                    </a>
-                @endguest
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
-                <label for="billing[first_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.first-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="address.billing.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
-                    @{{ errors.first('address-form.billing[first_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[last_name]') ? 'has-error' : '']">
-                <label for="billing[last_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.last-name') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="address.billing.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
-                    @{{ errors.first('address-form.billing[last_name]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
-                <label for="billing[email]" class="required">
-                    {{ __('shop::app.checkout.onepage.email') }}
-                </label>
-
-                <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[email]')">
-                    @{{ errors.first('address-form.billing[email]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[address1]') ? 'has-error' : '']">
-                <label for="billing[address1]" class="required">
-                    {{ __('shop::app.checkout.onepage.address1') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[address1]" name="billing[address1]" v-model="address.billing.address1" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[address1]')">
-                    @{{ errors.first('address-form.billing[address1]') }}
-                </span>
-            </div>
-
-            <div class="control-group">
-                <label for="billing[address2]">
-                    {{ __('shop::app.checkout.onepage.address2') }}
-                </label>
-
-                <input type="text" class="control" id="billing[address2]" name="billing[address2]" v-model="address.billing.address2"/>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[city]') ? 'has-error' : '']">
-                <label for="billing[city]" class="required">
-                    {{ __('shop::app.checkout.onepage.city') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="address.billing.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[city]')">
-                    @{{ errors.first('address-form.billing[city]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[state]') ? 'has-error' : '']">
-                <label for="billing[state]" class="required">
-                    {{ __('shop::app.checkout.onepage.state') }}
-                </label>
-
-
-                <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="!haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-                <select v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-                    <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-                    <option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
-                        @{{ state.default_name }}
-                    </option>
-
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[state]')">
-                    @{{ errors.first('address-form.billing[state]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[postcode]') ? 'has-error' : '']">
-                <label for="billing[postcode]" class="required">
-                    {{ __('shop::app.checkout.onepage.postcode') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="address.billing.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
-                    @{{ errors.first('address-form.billing[postcode]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
-                <label for="billing[country]" class="required">
-                    {{ __('shop::app.checkout.onepage.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                    <option value=""></option>
-
-                    @foreach (core()->countries() as $country)
-
-                        <option value="{{ $country->code }}">{{ $country->name }}</option>
-
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[country]')">
-                    @{{ errors.first('address-form.billing[country]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.billing[phone]') ? 'has-error' : '']">
-                <label for="billing[phone]" class="required">
-                    {{ __('shop::app.checkout.onepage.phone') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="address.billing.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
-                    @{{ errors.first('address-form.billing[phone]') }}
-                </span>
-            </div>
+        </div>
 
+        @auth('customer')
             <div class="control-group">
                 <span class="checkbox">
-                    <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
-                    <label class="checkbox-view" for="billing[use_for_shipping]"></label>
-                    {{ __('shop::app.checkout.onepage.use_for_shipping') }}
+                    <input type="checkbox" id="billing[save_as_address]" name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
+                    <label class="checkbox-view" for="billing[save_as_address]"></label>
+                    {{ __('shop::app.checkout.onepage.save_as_address') }}
                 </span>
-
             </div>
+        @endauth
+
+    </div>
+
+    <div class="form-container" v-if="!address.billing.use_for_shipping && !this.new_shipping_address">
+        <div class="form-header">
+            <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
+
+            <a class="btn btn-lg btn-primary" @click=newShippingAddress()>
+                {{ __('shop::app.checkout.onepage.new-address') }}
+            </a>
+        </div>
+        <div class="address-holder">
+
+            <div class="address-card-1" v-for='(addresses, index) in this.allAddress'>
+                <div class="details">
+
+                    <label class="radio-container">
+                        <input v-validate="'required'" type="radio" id="shipping[address_id]" name="shipping[address_id]" v-model="address.shipping.address_id" :value="addresses.id"
+                        data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-address') }}&quot;">
+                        <span class="checkmark"></span>
+                    </label>
+
+                    <span class="bold"> @{{ allAddress.first_name }} @{{ allAddress.last_name }}</span>
+                    @{{ addresses.name }}</br>
+                    @{{ addresses.address1 }}, @{{ addresses.address2 }} </br>
+                    @{{ addresses.city }}<br>
+                    @{{ addresses.state }}<br>
+                    @{{ addresses.country }}</br></br>
+                    {{ __('shop::app.customer.account.address.index.contact') }} : @{{ addresses.phone }}
+
+                </div>
+            </div>
+
+            <div class="control-group" :class="[errors.has('address-form.shipping[address_id]') ? 'has-error' : '']">
+                <span class="control-error" v-if="errors.has('address-form.shipping[address_id]')">
+                    @{{ errors.first('address-form.shipping[address_id]') }}
+                </span>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="form-container" v-if="!address.billing.use_for_shipping && this.new_shipping_address">
+
+        <div class="form-header">
+            <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
         </div>
 
-        <div class="form-container" v-if="!address.billing.use_for_shipping">
+        <div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
+            <label for="shipping[first_name]" class="required">
+                {{ __('shop::app.checkout.onepage.first-name') }}
+            </label>
 
-            <div class="form-header">
-                <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
-            </div>
+            <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
-                <label for="shipping[first_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.first-name') }}
-                </label>
+            <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
+                @{{ errors.first('address-form.shipping[first_name]') }}
+            </span>
+        </div>
 
-                <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.first-name') }}&quot;"/>
+        <div class="control-group" :class="[errors.has('address-form.shipping[last_name]') ? 'has-error' : '']">
+            <label for="shipping[last_name]" class="required">
+                {{ __('shop::app.checkout.onepage.last-name') }}
+            </label>
 
-                <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
-                    @{{ errors.first('address-form.shipping[first_name]') }}
-                </span>
-            </div>
+            <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[last_name]') ? 'has-error' : '']">
-                <label for="shipping[last_name]" class="required">
-                    {{ __('shop::app.checkout.onepage.last-name') }}
-                </label>
+            <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
+                @{{ errors.first('address-form.shipping[last_name]') }}
+            </span>
+        </div>
 
-                <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.last-name') }}&quot;"/>
+        <div class="control-group" :class="[errors.has('address-form.shipping[email]') ? 'has-error' : '']">
+            <label for="shipping[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}
+            </label>
 
-                <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
-                    @{{ errors.first('address-form.shipping[last_name]') }}
-                </span>
-            </div>
+            <input type="text" v-validate="'required|email'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[email]') ? 'has-error' : '']">
-                <label for="shipping[email]" class="required">
-                    {{ __('shop::app.checkout.onepage.email') }}
-                </label>
+            <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
+                @{{ errors.first('address-form.shipping[email]') }}
+            </span>
+        </div>
 
-                <input type="text" v-validate="'required|email'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
+        <div class="control-group" :class="[errors.has('address-form.shipping[address1]') ? 'has-error' : '']">
+            <label for="shipping[address1]" class="required">
+                {{ __('shop::app.checkout.onepage.address1') }}
+            </label>
 
-                <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
-                    @{{ errors.first('address-form.shipping[email]') }}
-                </span>
-            </div>
+            <input type="text" v-validate="'required'" class="control" id="shipping[address1]" name="shipping[address1]" v-model="address.shipping.address1" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[address1]') ? 'has-error' : '']">
-                <label for="shipping[address1]" class="required">
-                    {{ __('shop::app.checkout.onepage.address1') }}
-                </label>
+            <span class="control-error" v-if="errors.has('address-form.shipping[address1]')">
+                @{{ errors.first('address-form.shipping[address1]') }}
+            </span>
+        </div>
 
-                <input type="text" v-validate="'required'" class="control" id="shipping[address1]" name="shipping[address1]" v-model="address.shipping.address1" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
+        <div class="control-group">
+            <label for="shipping[address2]">
+                {{ __('shop::app.checkout.onepage.address2') }}
+            </label>
 
-                <span class="control-error" v-if="errors.has('address-form.shipping[address1]')">
-                    @{{ errors.first('address-form.shipping[address1]') }}
-                </span>
-            </div>
+            <input type="text" class="control" id="shipping[address2]" name="shipping[address2]" v-model="address.shipping.address2"/>
+        </div>
 
+        <div class="control-group" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
+            <label for="shipping[city]" class="required">
+                {{ __('shop::app.checkout.onepage.city') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
+                @{{ errors.first('address-form.shipping[city]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
+            <label for="shipping[state]" class="required">
+                {{ __('shop::app.checkout.onepage.state') }}
+            </label>
+
+
+            <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="!haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
+
+            <select v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+
+                <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
+
+                <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
+                    @{{ state.default_name }}
+                </option>
+
+            </select>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
+                @{{ errors.first('address-form.shipping[state]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.shipping[postcode]') ? 'has-error' : '']">
+            <label for="shipping[postcode]" class="required">
+                {{ __('shop::app.checkout.onepage.postcode') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
+                @{{ errors.first('address-form.shipping[postcode]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
+            <label for="shipping[country]" class="required">
+                {{ __('shop::app.checkout.onepage.country') }}
+            </label>
+
+            <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+                <option value=""></option>
+
+                @foreach (core()->countries() as $country)
+                    <option value="{{ $country->code }}">{{ $country->name }}</option>
+                @endforeach
+            </select>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
+                @{{ errors.first('address-form.shipping[country]') }}
+            </span>
+        </div>
+
+        <div class="control-group" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
+            <label for="shipping[phone]" class="required">
+                {{ __('shop::app.checkout.onepage.phone') }}
+            </label>
+
+            <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
+                @{{ errors.first('address-form.shipping[phone]') }}
+            </span>
+        </div>
+
+        @auth('customer')
             <div class="control-group">
-                <label for="shipping[address2]">
-                    {{ __('shop::app.checkout.onepage.address2') }}
-                </label>
-
-                <input type="text" class="control" id="shipping[address2]" name="shipping[address2]" v-model="address.shipping.address2"/>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
-                <label for="shipping[city]" class="required">
-                    {{ __('shop::app.checkout.onepage.city') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
-                    @{{ errors.first('address-form.shipping[city]') }}
+                <span class="checkbox">
+                    <input type="checkbox" id="shipping[save_as_address]" name="shipping[save_as_address]" v-model="address.shipping.save_as_address"/>
+                    <label class="checkbox-view" for="shipping[save_as_address]"></label>
+                    {{ __('shop::app.checkout.onepage.save_as_address') }}
                 </span>
             </div>
+        @endauth
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
-                <label for="shipping[state]" class="required">
-                    {{ __('shop::app.checkout.onepage.state') }}
-                </label>
-
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="!haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;"/>
-
-                <select v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state" v-if="haveStates('shipping')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
-
-                    <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
-
-                    <option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
-                        @{{ state.default_name }}
-                    </option>
-
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
-                    @{{ errors.first('address-form.shipping[state]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[postcode]') ? 'has-error' : '']">
-                <label for="shipping[postcode]" class="required">
-                    {{ __('shop::app.checkout.onepage.postcode') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
-                    @{{ errors.first('address-form.shipping[postcode]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
-                <label for="shipping[country]" class="required">
-                    {{ __('shop::app.checkout.onepage.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                    <option value=""></option>
-
-                    @foreach (core()->countries() as $country)
-                        <option value="{{ $country->code }}">{{ $country->name }}</option>
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
-                    @{{ errors.first('address-form.shipping[country]') }}
-                </span>
-            </div>
-
-            <div class="control-group" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
-                <label for="shipping[phone]" class="required">
-                    {{ __('shop::app.checkout.onepage.phone') }}
-                </label>
-
-                <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;"/>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
-                    @{{ errors.first('address-form.shipping[phone]') }}
-                </span>
-            </div>
-        </div>
-    @endif
+    </div>
 
 </form>