diff --git a/tailbone/templates/custorders/create.mako b/tailbone/templates/custorders/create.mako
index 95bd1498..bb06ca40 100644
--- a/tailbone/templates/custorders/create.mako
+++ b/tailbone/templates/custorders/create.mako
@@ -108,144 +108,157 @@
+ style="padding-left: 10rem; display: flex;">
-
-
-
-
+
+
+
+
+
+
+
+
+ View Profile
+
-
- View Profile
-
-
-
+
-
-
-
-
- {{ orderPhoneNumber }}
-
-
-
- Edit
-
+
+
+
+
+ {{ orderPhoneNumber }}
+
+
-
-
+
-
-
-
-
-
- {{ orderEmailAddress }}
-
-
- (no valid email on file)
-
-
-
-
- Edit
-
-
-
+
+
+
+
+
+ {{ orderEmailAddress }}
+
+
+ (no valid email on file)
+
+
+
+
+
-
-
+
-
+
+
+
+
+
+ {{ note }}
+
+
@@ -505,6 +518,7 @@
customerName: null,
phoneNumber: null,
orderEmailAddress: ${json.dumps(batch.email_address)|n},
+ contactNotes: ${json.dumps(contact_notes)|n},
editPhoneNumberShowDialog: false,
editPhoneNumberValue: null,
@@ -803,7 +817,6 @@
}
let that = this
this.submitBatchData(params, function(response) {
- console.log(response.data)
% if new_order_requires_customer:
that.contactUUID = response.data.customer_uuid
% else:
@@ -812,6 +825,7 @@
that.orderPhoneNumber = response.data.phone_number
that.orderEmailAddress = response.data.email_address
that.contactProfileURL = response.data.contact_profile_url
+ that.contactNotes = response.data.contact_notes
})
},
diff --git a/tailbone/views/custorders/orders.py b/tailbone/views/custorders/orders.py
index 151f4572..885d9ec8 100644
--- a/tailbone/views/custorders/orders.py
+++ b/tailbone/views/custorders/orders.py
@@ -256,6 +256,7 @@ class CustomerOrderView(MasterView):
'normalized_batch': self.normalize_batch(batch),
'new_order_requires_customer': self.handler.new_order_requires_customer(),
'contact_profile_url': None,
+ 'contact_notes': self.handler.get_contact_notes(batch),
'order_items': items,
'product_autocomplete_url': self.request.route_url(product_autocomplete)}
@@ -391,6 +392,7 @@ class CustomerOrderView(MasterView):
'person_uuid': batch.person_uuid,
'phone_number': batch.phone_number,
'email_address': batch.email_address,
+ 'contact_notes': self.handler.get_contact_notes(batch),
}
# maybe add profile URL
@@ -411,6 +413,7 @@ class CustomerOrderView(MasterView):
'phone_number': batch.phone_number,
'email_address': batch.email_address,
'contact_profile_url': None,
+ 'contact_notes': self.handler.get_contact_notes(batch),
}
return context