Customer account page (mrvautin#124)

* Adding customer login & account page support * Added account link * Sorting orders on account page * Small UI fixes * Removed debugs * Added tests Co-authored-by: Mark Moffat <[email protected]>
Hororo · Mar 17, 2020 · 78e06e5 · 78e06e5
1 parent 6b9f4b2
commit 78e06e5
Show file tree

Hide file tree

Showing 19 changed files with 411 additions and 32 deletions.
diff --git a/lib/schemas/editCustomer.json b/lib/schemas/editCustomer.json
@@ -2,6 +2,9 @@
     "$id": "editCustomer",
     "type": "object",
     "properties": {
+        "company": {
+            "type": "string"
+        },
         "email": {
             "type": "string",
             "format": "emailAddress"

diff --git a/public/javascripts/admin.min.js b/public/javascripts/admin.min.js
diff --git a/public/javascripts/expressCart.js b/public/javascripts/expressCart.js
@@ -237,6 +237,27 @@ $(document).ready(function (){
         e.preventDefault();
     });
 
+    $('#customerloginForm').on('click', function(e){
+        if(!e.isDefaultPrevented()){
+            e.preventDefault();
+            $.ajax({
+                method: 'POST',
+                url: '/customer/login_action',
+                data: {
+                    loginEmail: $('#email').val(),
+                    loginPassword: $('#password').val()
+                }
+            })
+            .done(function(msg){
+                window.location = '/customer/account';
+            })
+            .fail(function(msg){
+                showNotification(msg.responseJSON.message, 'danger');
+            });
+        }
+        e.preventDefault();
+    });
+
     // call update settings API
     $('#customerLogin').on('click', function(e){
         if(!e.isDefaultPrevented()){
@@ -270,6 +291,37 @@ $(document).ready(function (){
         e.preventDefault();
     });
 
+    // Customer saving own details
+    $('#customerSave').validator().on('click', function(e){
+        e.preventDefault();
+        if($('#customer-form').validator('validate').has('.has-error').length === 0){
+            $.ajax({
+                method: 'POST',
+                url: '/customer/update',
+                data: {
+                    email: $('#shipEmail').val(),
+                    company: $('#shipCompany').val(),
+                    firstName: $('#shipFirstname').val(),
+                    lastName: $('#shipLastname').val(),
+                    address1: $('#shipAddr1').val(),
+                    address2: $('#shipAddr2').val(),
+                    country: $('#shipCountry').val(),
+                    state: $('#shipState').val(),
+                    postcode: $('#shipPostcode').val(),
+                    phone: $('#shipPhoneNumber').val(),
+                    password: $('#newCustomerPassword').val(),
+                    orderComment: $('#orderComment').val()
+                }
+            })
+            .done(function(){
+                showNotification('Customer saved', 'success');
+            })
+            .fail(function(msg){
+                showNotification(msg.responseJSON.message, 'danger');
+            });
+        }
+    });
+
     $(document).on('click', '.image-next', function(e){
         var thumbnails = $('.thumbnail-image');
         var index = 0;

diff --git a/public/javascripts/expressCart.min.js b/public/javascripts/expressCart.min.js
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
@@ -244,8 +244,6 @@ body .popover {
 [role="main"] {
   padding-top: 20px;
   margin-bottom: 20px;
-  min-height: 100%;
-  height: 100%;
 }
 @media (min-width: 768px) {
   [role="main"] {

diff --git a/public/stylesheets/admin.min.css b/public/stylesheets/admin.min.css
diff --git a/public/stylesheets/less/admin.less b/public/stylesheets/less/admin.less
@@ -283,8 +283,6 @@ body .popover{display:none !important; }
 [role="main"] {
     padding-top: 20px;
     margin-bottom: 20px;
-    min-height: 100%;
-    height: 100%;
 }
 
 @media (min-width: 768px) {