rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Show "contact notes" when creating new custorder

Browse source
This commit is contained in:
Lance Edgar 2021-10-03 19:26:25 -04:00
parent 272b0fd071
commit 711e526822
2 changed files with 138 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tailbone/templates/custorders/create.mako
View file

@ -108,7 +108,9 @@
</div> </div>
<div v-show="contactIsKnown" <div v-show="contactIsKnown"
style="padding-left: 10rem;"> style="padding-left: 10rem; display: flex;">
<div :style="{'flex-grow': contactNotes.length ? 0 : 1}">
<b-field label="Customer" grouped> <b-field label="Customer" grouped>
<b-field style="margin-left: 1rem;"" <b-field style="margin-left: 1rem;""
@ -248,6 +250,17 @@
</b-field> </b-field>
</div> </div>
<div v-show="contactNotes.length"
style="margin-left: 1rem;">
<b-notification v-for="note in contactNotes"
:key="note"
type="is-warning"
:closable="false">
{{ note }}
</b-notification>
</div>
</div>
<br /> <br />
<div class="field"> <div class="field">
<b-radio v-model="contactIsKnown" disabled <b-radio v-model="contactIsKnown" disabled
@ -505,6 +518,7 @@
customerName: null, customerName: null,
phoneNumber: null, phoneNumber: null,
orderEmailAddress: ${json.dumps(batch.email_address)|n}, orderEmailAddress: ${json.dumps(batch.email_address)|n},
contactNotes: ${json.dumps(contact_notes)|n},
editPhoneNumberShowDialog: false, editPhoneNumberShowDialog: false,
editPhoneNumberValue: null, editPhoneNumberValue: null,
@ -803,7 +817,6 @@
} }
let that = this let that = this
this.submitBatchData(params, function(response) { this.submitBatchData(params, function(response) {
console.log(response.data)
% if new_order_requires_customer: % if new_order_requires_customer:
that.contactUUID = response.data.customer_uuid that.contactUUID = response.data.customer_uuid
% else: % else:
@ -812,6 +825,7 @@
that.orderPhoneNumber = response.data.phone_number that.orderPhoneNumber = response.data.phone_number
that.orderEmailAddress = response.data.email_address that.orderEmailAddress = response.data.email_address
that.contactProfileURL = response.data.contact_profile_url that.contactProfileURL = response.data.contact_profile_url
that.contactNotes = response.data.contact_notes
}) })
}, },

3
tailbone/views/custorders/orders.py
View file

@ -256,6 +256,7 @@ class CustomerOrderView(MasterView):
'normalized_batch': self.normalize_batch(batch), 'normalized_batch': self.normalize_batch(batch),
'new_order_requires_customer': self.handler.new_order_requires_customer(), 'new_order_requires_customer': self.handler.new_order_requires_customer(),
'contact_profile_url': None, 'contact_profile_url': None,
'contact_notes': self.handler.get_contact_notes(batch),
'order_items': items, 'order_items': items,
'product_autocomplete_url': self.request.route_url(product_autocomplete)} 'product_autocomplete_url': self.request.route_url(product_autocomplete)}
@ -391,6 +392,7 @@ class CustomerOrderView(MasterView):
'person_uuid': batch.person_uuid, 'person_uuid': batch.person_uuid,
'phone_number': batch.phone_number, 'phone_number': batch.phone_number,
'email_address': batch.email_address, 'email_address': batch.email_address,
'contact_notes': self.handler.get_contact_notes(batch),
} }
# maybe add profile URL # maybe add profile URL
@ -411,6 +413,7 @@ class CustomerOrderView(MasterView):
'phone_number': batch.phone_number, 'phone_number': batch.phone_number,
'email_address': batch.email_address, 'email_address': batch.email_address,
'contact_profile_url': None, 'contact_profile_url': None,
'contact_notes': self.handler.get_contact_notes(batch),
} }
return context return context