diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index f97437f..9176d8c 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | AvoRed E commerce Languages
@@ -25,7 +24,9 @@
     'admin-login-card-title' => 'AvoRed Admin Login',
     'admin-login-forget-password-link' => 'Forgot your Password?',
     'admin-login-button-title' => 'Login',
+    'admin-reset-button-title' => 'Send Password Reset Link',
     'admin-password-label' => 'Password',
+    'admin-confirm-password-label' => 'Confirm Password',
     'admin-email-label' => 'Email Address',
 
     'admin-dashboard-total-user-title' => 'Total User',
@@ -40,5 +41,4 @@
     'address.configuration.title' => 'Address Configuration List',
 
     'cancel' => 'Cancel',
-
 ];
diff --git a/resources/views/attribute/_fields.blade.php b/resources/views/attribute/_fields.blade.php
index fbbaa5b..84e62aa 100644
--- a/resources/views/attribute/_fields.blade.php
+++ b/resources/views/attribute/_fields.blade.php
@@ -1,5 +1,22 @@
-@include('avored-ecommerce::forms.text',['name' => 'name','label' => __('avored-ecommerce::attribute.name')])
-@include('avored-ecommerce::forms.text',['name' => 'identifier','label' => __('avored-ecommerce::attribute.identifier')])
+
+<avored-form-input 
+    field-name="name"
+    label="{{ __('avored-ecommerce::attribute.name') }}" 
+    field-value="{!! $model->name ?? "" !!}" 
+    error-text="{!! $errors->first('name') !!}"
+    v-on:change="changeModelValue"
+    autofocus="autofocus"
+        >
+</avored-form-input>
+
+<avored-form-input 
+    field-name="identifier"
+    label="{{ __('avored-ecommerce::attribute.identifier') }}" 
+    field-value="{!! $model->identifier ?? "" !!}" 
+    error-text="{!! $errors->first('identifier') !!}"
+    v-on:change="changeModelValue"
+        >
+</avored-form-input>
 
 
 <?php
@@ -8,13 +25,12 @@
 
 $randomString = substr(str_shuffle(str_repeat($pool, 6)), 0, 6);
 
-$hiddenClass = "";
+$hiddenClass = '';
 $editMode = false;
 
-
 if (isset($model) && $model->attributeDropdownOptions->count() > 0) {
     $editMode = true;
-    $hiddenClass = "";
+    $hiddenClass = '';
 }
 ?>
 
diff --git a/resources/views/attribute/create.blade.php b/resources/views/attribute/create.blade.php
index 5fa2ad0..761fb3c 100644
--- a/resources/views/attribute/create.blade.php
+++ b/resources/views/attribute/create.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-        <div class="row">
+        <div id="admin-attribute-page" class="row">
             <div class="col-12">
                 <div class="card">
                     <div class="card-header">{{ __('avored-ecommerce::attribute.create') }}</div>
@@ -25,4 +25,28 @@
 
             </div>
         </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+
+<script>
+
+ var app = new Vue({
+        el: '#admin-attribute-page',
+        data : {
+            model: {},
+            autofocus:true,
+            disabled: false
+           
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+                this.model[fieldName] = val;
+            }
+        }
+    });
+
+</script>
+
+
+@endpush
\ No newline at end of file
diff --git a/resources/views/attribute/edit.blade.php b/resources/views/attribute/edit.blade.php
index 0587d76..e6f53a5 100644
--- a/resources/views/attribute/edit.blade.php
+++ b/resources/views/attribute/edit.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="row">
+    <div id="admin-attribute-page" class="row">
         <div class="col-12">
             <div class="card">
                 <div class="card-header">{{ __('avored-ecommerce::attribute.edit') }}</div>
@@ -27,4 +27,28 @@
         </div>
     </div>
 
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+
+<script>
+
+ var app = new Vue({
+        el: '#admin-attribute-page',
+        data : {
+            model: {},
+            autofocus:true,
+            disabled: false
+           
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+                this.model[fieldName] = val;
+            }
+        }
+    });
+
+</script>
+
+
+@endpush
\ No newline at end of file
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 7b893d1..020f872 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -41,23 +41,22 @@
                               action="{{ route('admin.password.reset.token') }}">
                             @csrf
 
-                            <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                                <label for="email" >E-Mail Address</label>
-                                    <input v-model="email" id="email" type="email" class="form-control" name="email"
-                                           value="{{ old('email') }}" required>
-
-                                    @if ($errors->has('email'))
-                                        <span class="help-block">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                    @endif
-
-                            </div>
+                            <avored-form-input 
+                                field-name="email"
+                                label="{{ __('avored-ecommerce::lang.admin-email-label') }}" 
+                                error-text="{!! $errors->first('email') !!}"
+                                v-on:change="changeModelValue"
+                                autofocus="autofocus"
+                                    >
+                            </avored-form-input>
 
                             <div class="form-group">
-
-                                <button type="submit" :disabled="isLoginDisbled" class="btn btn-primary">
-                                    Send Password Reset Link
+                               
+                                <button 
+                                    type="submit" 
+                                    :disabled='isSendPasswordSubmitDisbled'  
+                                    class="btn btn-primary">
+                                    {{ __('avored-ecommerce::lang.admin-reset-button-title') }}
                                 </button>
 
                             </div>
@@ -80,17 +79,23 @@
     var app = new Vue({
         el: '#reset-password-page',
         data : {
-            email: ''
+            email: '',
+            autofocus:true
         },
         computed: {
-            isLoginDisbled: function() {
-
+            isSendPasswordSubmitDisbled: function() {
                 if(this.email != "") {
                     return false;
                 }
-
                 return true;
-
+            }
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+    
+                if(fieldName == "email") {
+                    this.email = val;
+                }
             }
         }
     });
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index f80a12d..b288302 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -36,44 +36,36 @@
                                 action="{{ route('admin.password.email.post') }}">
                                 @csrf
 
-                                <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                                    <label for="email">E-Mail Address</label>
-                                    <input v-model="email" id="email" type="email" class="form-control" name="email"
-                                        value="{{ $email or old('email') }}" required autofocus>
+                                <avored-form-input 
+                                    field-name="email"
+                                    label="{{ __('avored-ecommerce::lang.admin-email-label') }}" 
+                                    error-text="{!! $errors->first('email') !!}"
+                                    v-on:change="changeModelValue"
+                                    autofocus="autofocus"
+                                        >
+                                </avored-form-input>
+
+                                <avored-form-input 
+                                    field-name="password"
+                                    field-type="password"
+                                    label="{{ __('avored-ecommerce::lang.admin-password-label') }}" 
+                                    error-text="{!! $errors->first('password') !!}"
+                                    v-on:change="changeModelValue"
+                                    
+                                        >
+                                </avored-form-input>
+                                
+                                <avored-form-input 
+                                    field-name="password_confirmation"
+                                    field-type="password"
+                                    label="{{ __('avored-ecommerce::lang.admin-confirm-password-label') }}" 
+                                    error-text="{!! $errors->first('password_confirmation') !!}"
+                                    v-on:change="changeModelValue"
+                                    
+                                        >
+                                </avored-form-input>
 
-                                    @if ($errors->has('email'))
-                                        <span class="help-block">
-                                            <strong>{{ $errors->first('email') }}</strong>
-                                        </span>
-                                    @endif
 
-                                </div>
-
-                                <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                                    <label for="password">Password</label>
-                                    <input v-model="password" id="password" type="password" class="form-control" name="password" required>
-
-                                    @if ($errors->has('password'))
-                                        <span class="help-block">
-                                            <strong>{{ $errors->first('password') }}</strong>
-                                        </span>
-                                    @endif
-
-                                </div>
-
-                                <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-                                    <label for="password-confirm">Confirm Password</label>
-                                    <input v-model="password_confirmation" id="password-confirm"
-                                        type="password" class="form-control"
-                                        name="password_confirmation" required>
-
-                                    @if ($errors->has('password_confirmation'))
-                                        <span class="help-block">
-                                            <strong>{{ $errors->first('password_confirmation') }}</strong>
-                                        </span>
-                                    @endif
-
-                                </div>
 
                                 <div class="form-group">
                                     <button :disabled='isLoginDisbled' type="submit" class="btn btn-primary">
@@ -105,11 +97,20 @@
         computed: {
             isLoginDisbled: function() {
 
-                if(this.email != "" && this.password != "" && this.password_confirmation != "" && this.password == this.password_confirmation)  {
+                if(this.email != "" && 
+                    this.password != "" && 
+                    this.password_confirmation != "" && 
+                    this.password == this.password_confirmation)  {
                     return false;
                 }
                 return true;
 
+            }
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+                this[fieldName] = val;
+               
             }
         }
     });
diff --git a/resources/views/category/_fields.blade.php b/resources/views/category/_fields.blade.php
index e13af03..9568648 100644
--- a/resources/views/category/_fields.blade.php
+++ b/resources/views/category/_fields.blade.php
@@ -1,6 +1,3 @@
-
-
-
 <avored-form-input 
     field-name="name"
     label="Category Name" 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d329c47..00d51fd 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -48,6 +48,15 @@
 
                     </div>
                 @endif
+                @if(session()->has('errorNotificationText'))
+                    <div class="alert alert-danger alert-dismissible" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
+                                    aria-hidden="true">&times;</span></button>
+
+                        <strong>Opps!</strong> {{ session()->get('errorNotificationText') }}
+
+                    </div>
+                @endif
             </div>
         </div>
         {!! Breadcrumb::render(Route::getCurrentRoute()->getName()  ) !!}
diff --git a/resources/views/module/create.blade.php b/resources/views/module/create.blade.php
new file mode 100644
index 0000000..3b4c45e
--- /dev/null
+++ b/resources/views/module/create.blade.php
@@ -0,0 +1,42 @@
+@extends('avored-ecommerce::layouts.app')
+
+@section('content')
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header">
+                    {{ __('avored-ecommerce::module.module-upload') }}
+                </div>
+                <div class="card-body">
+                    <form method="post"
+                          action="{{ route('admin.module.store') }}"
+                          enctype="multipart/form-data">
+
+                        @csrf()
+
+                        <div class="form-group">
+                            <label for="module_zip_file">
+                                {{ __('avored-ecommerce::module.module-upload-file') }}
+                            </label>
+                            <input type="file" 
+                                class="form-control" 
+                                name="module_zip_file" 
+                                id="module_zip_file"/>
+                        </div>
+
+                        <div class="form-group">
+                            <button type="submit" class="btn btn-primary">
+                                {{ __('avored-ecommerce::module.module-upload') }}
+                            </button>
+
+                            <a href="{{ route('admin.module.index') }}" class="btn">Cancel</a>
+                        </div>
+
+                    </form>
+
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/page/_fields.blade.php b/resources/views/page/_fields.blade.php
index e42b57f..71cbbec 100644
--- a/resources/views/page/_fields.blade.php
+++ b/resources/views/page/_fields.blade.php
@@ -1,6 +1,25 @@
-@include('avored-ecommerce::forms.text',['name' => 'name','label' => 'Name'])
-@include('avored-ecommerce::forms.text',['name' => 'slug','label' => 'Slug'])
 
+<avored-form-input 
+    field-name="name"
+    label="{{ __('avored-ecommerce::attribute.name') }}" 
+    field-value="{!! $model->name ?? "" !!}" 
+    error-text="{!! $errors->first('name') !!}"
+    v-on:change="changeModelValue"
+    autofocus="autofocus"
+        >
+</avored-form-input>
+
+
+
+<avored-form-input 
+    field-name="slug"
+    label="{{ __('Slug') }}" 
+    field-value="{!! $model->slug ?? "" !!}" 
+    error-text="{!! $errors->first('slug') !!}"
+    v-on:change="changeModelValue"
+   
+        >
+</avored-form-input>
 @php
     $content = (isset($model)) ? $model->getContent() : "";
 @endphp
@@ -11,9 +30,25 @@ class="summernote form-control"
     >{{ $content }}</textarea>
 </div>
 
-
-@include('avored-ecommerce::forms.text',['name' => 'meta_title','label' => 'Meta Title'])
-@include('avored-ecommerce::forms.text',['name' => 'meta_description','label' => 'Meta Description'])
+<avored-form-input 
+    field-name="meta_title"
+    label="{{ __('Meta Title') }}" 
+    field-value="{!! $model->meta_title ?? "" !!}" 
+    error-text="{!! $errors->first('meta_title') !!}"
+    v-on:change="changeModelValue"
+   
+        >
+</avored-form-input>
+
+<avored-form-input 
+    field-name="meta_description"
+    label="{{ __('Meta Description') }}" 
+    field-value="{!! $model->meta_description ?? "" !!}" 
+    error-text="{!! $errors->first('meta_description') !!}"
+    v-on:change="changeModelValue"
+   
+        >
+</avored-form-input>
 
 
 <div class="modal" id="widget-list-modal" tabindex="-1" role="dialog">
@@ -31,10 +66,18 @@ class="summernote form-control"
 
             </div>
             <div class="modal-footer">
-                <button type="button" id="widget-insert-button" data-dismiss="modal" class="btn btn-primary">Insert
-                    Widget
+                <button type="button" 
+                        id="widget-insert-button" 
+                        data-dismiss="modal" 
+                        class="btn btn-primary">
+                    Insert Widget
                 </button>
-                <button type="button" id="widget-close-button" data-dismiss="modal" class="btn btn-default">Close
+                <button type="button"   
+                    id="widget-close-button" 
+                    data-dismiss="modal"
+                     class="btn btn-default">
+                     
+                     Close
                 </button>
             </div>
         </div>
diff --git a/resources/views/page/create.blade.php b/resources/views/page/create.blade.php
index f8cc4b7..34732e8 100644
--- a/resources/views/page/create.blade.php
+++ b/resources/views/page/create.blade.php
@@ -1,7 +1,7 @@
 @extends('avored-ecommerce::layouts.app')
 
 @section('content')
-    <div class="container">
+    <div id="admin-cms-page" class="container">
         <div class="row">
             <div class="col-12">
                 <div class="card">
@@ -26,4 +26,28 @@
             </div>
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+
+<script>
+
+ var app = new Vue({
+        el: '#admin-cms-page',
+        data : {
+            model: {},
+            autofocus:true,
+            disabled: false
+           
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+                this.model[fieldName] = val;
+            }
+        }
+    });
+
+</script>
+
+
+@endpush
diff --git a/resources/views/page/edit.blade.php b/resources/views/page/edit.blade.php
index e2d1617..2673830 100644
--- a/resources/views/page/edit.blade.php
+++ b/resources/views/page/edit.blade.php
@@ -1,7 +1,7 @@
 @extends('avored-ecommerce::layouts.app')
 
 @section('content')
-<div class="container">
+<div id="admin-cms-page" class="container">
     <div class="row">
         <div class="col-12">
             <div class="card">
@@ -26,4 +26,28 @@
         </div>
     </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+
+<script>
+
+ var app = new Vue({
+        el: '#admin-cms-page',
+        data : {
+            model: {},
+            autofocus:true,
+            disabled: false
+           
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+                this.model[fieldName] = val;
+            }
+        }
+    });
+
+</script>
+
+
+@endpush
\ No newline at end of file
diff --git a/resources/views/page/index.blade.php b/resources/views/page/index.blade.php
index ef3d023..d2a16eb 100644
--- a/resources/views/page/index.blade.php
+++ b/resources/views/page/index.blade.php
@@ -10,4 +10,4 @@
         {!! DataGrid::render($dataGrid) !!}
     </div>
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/payment/stripe/index.blade.php b/resources/views/payment/stripe/index.blade.php
index cee0d7a..bdb477b 100644
--- a/resources/views/payment/stripe/index.blade.php
+++ b/resources/views/payment/stripe/index.blade.php
@@ -121,12 +121,6 @@ function stripeTokenHandler(token) {
             hiddenInput.setAttribute('value', token.id);
             formWrapper.appendChild(hiddenInput);
 
-            var hiddenInput = document.createElement('input');
-            hiddenInput.setAttribute('type', 'hidden');
-            hiddenInput.setAttribute('name', 'payment_option');
-            hiddenInput.setAttribute('value', 'stripe');
-            formWrapper.appendChild(hiddenInput);
-
         }
 
     </script>
diff --git a/resources/views/shipping/free-shipping.blade.php b/resources/views/shipping/free-shipping.blade.php
index 526fa52..188aa98 100644
--- a/resources/views/shipping/free-shipping.blade.php
+++ b/resources/views/shipping/free-shipping.blade.php
@@ -1,3 +1,39 @@
+
+@if($shippingOption->enable())
+<div class="form-check">
+
+    <input type="radio" name="shipping_option"
+
+        data-title="{{ $shippingOption->name() }}"
+        data-cost="{{ number_format($shippingOption->amount(),2) }}"
+        id="{{ $shippingOption->identifier() }}"
+        value="{{ $shippingOption->identifier() }}"
+        
+        @if($errors->has('shipping_option'))
+            class="is-invalid form-check-input shipping_option_radio"
+        @else
+            class="shipping_option_radio form-check-input"
+        @endif
+
+    />
+
+    <label for="{{ $shippingOption->identifier() }}" class="form-check-label">
+        @if(null === $shippingOption->amount())
+            {{ $shippingOption->name() }}
+        @else
+            {{ $shippingOption->name() . " $" . number_format($shippingOption->amount(),2) }}
+        @endif
+    </label>
+    @if ($errors->has('shipping_option'))
+    <div class="invalid-feedback" style="display: block">
+        {{ $errors->first('shipping_option') }}
+    </div>
+    @endif
+    
+</div>
+
+@endif
+
 @push('scripts')
     <script>
         $(document).ready(function () {
diff --git a/routes/web.php b/routes/web.php
index fdf0aa3..712e9a3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -69,7 +69,7 @@
         /** --------  Modules ROUTES  -------- **/
         Route::get('module', 'ModuleController@index')->name('module.index');
         Route::get('module/create', 'ModuleController@create')->name('module.create');
-        Route::get('module/{module}', 'ModuleController@show')->name('module.show');
+        Route::post('module', 'ModuleController@store')->name('module.store');
 
         Route::get('themes', 'ThemeController@index')->name('theme.index');
         Route::get('themes/create', 'ThemeController@create')->name('theme.create');
diff --git a/src/Http/Controllers/ModuleController.php b/src/Http/Controllers/ModuleController.php
index 5b29425..4de62d5 100644
--- a/src/Http/Controllers/ModuleController.php
+++ b/src/Http/Controllers/ModuleController.php
@@ -3,6 +3,8 @@
 namespace AvoRed\Ecommerce\Http\Controllers;
 
 use AvoRed\Framework\Modules\Facade as Module;
+use AvoRed\Ecommerce\Http\Requests\UploadModuleRequest;
+use ZipArchive;
 
 class ModuleController extends Controller
 {
@@ -18,4 +20,40 @@ public function index()
         return view('avored-ecommerce::module.index')
             ->with('modules', $modules);
     }
+
+    /**
+     * Display upload module forms
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view('avored-ecommerce::module.create');
+    }
+
+    /**
+     * Store and Extract upload module zip files
+     *
+     * @param \AvoRed\Ecommerce\Http\Requests\UploadModuleRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(UploadModuleRequest $request)
+    {
+        $path = storage_path('app/' . $request->module_zip_file->store('public/uploads/modules'));
+
+        $zip = new ZipArchive;
+
+        if ($zip->open($path) === true) {
+            $extractPath = base_path('modules');
+            $zip->extractTo($extractPath);
+            $zip->close();
+
+            return redirect()->route('admin.module.index')
+                        ->with('notificationText', 'Module Extracted successfully');
+        } else {
+            return redirect()
+                    ->back()
+                    ->with('errorNotificationText', 'There is some issue: Please check your permission and try again later!');
+        }
+    }
 }
diff --git a/src/Http/Requests/UploadModuleRequest.php b/src/Http/Requests/UploadModuleRequest.php
new file mode 100644
index 0000000..4c7d545
--- /dev/null
+++ b/src/Http/Requests/UploadModuleRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace AvoRed\Ecommerce\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest as Request;
+
+class UploadModuleRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $rules = [];
+        $rules['module_zip_file'] = 'required';
+
+        return $rules;
+    }
+}
diff --git a/src/Payment/Stripe/Payment.php b/src/Payment/Stripe/Payment.php
index 2818846..0b0d969 100644
--- a/src/Payment/Stripe/Payment.php
+++ b/src/Payment/Stripe/Payment.php
@@ -7,7 +7,6 @@
 use AvoRed\Framework\Models\Database\Configuration;
 use AvoRed\Framework\Payment\Payment as PaymentEcommerce;
 use AvoRed\Framework\Payment\Contracts\Payment as PaymentContracts;
-use AvoRed\Ecommerce\Models\Database\User;
 
 class Payment extends PaymentEcommerce implements PaymentContracts
 {
@@ -91,20 +90,10 @@ public function process($orderData, $cartProducts, $request)
         $apiKey = Configuration::getConfiguration(self::CONFIG_SECRET_KEY);
 
         Stripe::setApiKey($apiKey);
-        //dd($orderData);
-        //$user = User::find($orderData['user_id']);
-        //$customer = \Stripe\Customer::create([
-        //    'email' => $user->email,
-        //    'description' => 'Customer for One of Charge ' . $user->id,
-        //    'source' => $request->get('stripeToken')
-        //  ]);
-
-        //dd($request->all());
-        //dd($request->get('stripeToken'));
-
+        $currencyCode = Configuration::getConfiguration('general_site_currency');
         $response = Charge::create([
             'amount' => $totalCents,
-            'currency' => 'nzd',
+            'currency' => $currencyCode,
             'source' => $request->get('stripeToken'), // obtained with Stripe.js
             'description' => 'AvoRed E commerce Payment',
         ]);
diff --git a/src/Shipping/FreeShipping.php b/src/Shipping/FreeShipping.php
index 5bf8ce1..f5131eb 100644
--- a/src/Shipping/FreeShipping.php
+++ b/src/Shipping/FreeShipping.php
@@ -9,7 +9,6 @@
 
 class FreeShipping extends AbstractShipping implements ShippingContract
 {
-
     const CONFIG_KEY = 'shipping_free_shipping_enabled';
 
     /**
@@ -90,7 +89,6 @@ public function amount()
         return $this->amount;
     }
 
-
     /**
      * Payment Option View Path.
      *
@@ -111,7 +109,6 @@ public function with()
         return [];
     }
 
-
     /**
      * Processing Amount for this Shipping Option.
      *
@@ -125,4 +122,17 @@ public function process($cartProducts)
 
         return $this;
     }
+
+    /**
+     * Calculate the cost of Shipping based on Checkout Form Data.
+     *
+     * @param \Illuminate\Support\Collection $cartProducts
+     * @return self
+     */
+    public function calculate($checkoutFormData)
+    {
+        $view = view($this->view)->with('shippingOption', $this);
+
+        return $view->render();
+    }
 }