diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
index 2f37f0eab..9ba1414dc 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -152,7 +152,6 @@ class CustomerController extends Controller
'first_name' => 'string|required',
'last_name' => 'string|required',
'gender' => 'required',
- 'phone' => 'nullable|numeric|unique:customers,phone,'. $id,
'email' => 'required|unique:customers,email,'. $id,
'date_of_birth' => 'date|before:today'
]);
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
index 4a797e1b9..f672d29bd 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
@@ -66,7 +66,7 @@
-
+
@{{ errors.first('phone') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
index 5b3d3bad1..8be4e87a4 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -72,7 +72,7 @@
-
+
@{{ errors.first('phone') }}
diff --git a/packages/Webkul/Customer/src/Database/Migrations/2019_06_19_162817_remove_unique_in_phone_column_in_customers_table.php b/packages/Webkul/Customer/src/Database/Migrations/2019_06_19_162817_remove_unique_in_phone_column_in_customers_table.php
new file mode 100644
index 000000000..e4c372437
--- /dev/null
+++ b/packages/Webkul/Customer/src/Database/Migrations/2019_06_19_162817_remove_unique_in_phone_column_in_customers_table.php
@@ -0,0 +1,32 @@
+dropUnique('customers_phone_unique');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('customers', function (Blueprint $table) {
+ //
+ });
+ }
+}
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 b065f43c1..aa13372fa 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -72,7 +72,7 @@
-
+
groupedStatesByCountries()),
country: @json(core()->countries()),
- summeryComponentKey: 0
+ summeryComponentKey: 0,
+ reviewComponentKey: 0
}
},
@@ -209,6 +210,7 @@
summaryHtml = Vue.compile(response.data.html)
this_this.summeryComponentKey++;
+ this_this.reviewComponentKey++;
})
.catch(function (error) {})
},
@@ -456,8 +458,11 @@
this.templateRender = reviewHtml.render;
for (var i in reviewHtml.staticRenderFns) {
- reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]);
+ // reviewTemplateRenderFns.push(reviewHtml.staticRenderFns[i]);
+ reviewTemplateRenderFns[i] = reviewHtml.staticRenderFns[i];
}
+
+ this.$forceUpdate();
}
});
@@ -489,7 +494,7 @@
mounted: function() {
this.templateRender = summaryHtml.render;
-
+
for (var i in summaryHtml.staticRenderFns) {
// summaryTemplateRenderFns.push(summaryHtml.staticRenderFns[i]);
summaryTemplateRenderFns[i] = summaryHtml.staticRenderFns[i];