Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui

Browse Source
This commit is contained in:
Shivam Mishra 2020-12-01 11:30:53 +05:30
commit 0b774e8ea5
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/scss/point-of-sale.scss
View File

@ -1067,6 +1067,7 @@
display: flex;
text-align: right;
margin-left: var(--margin-md);
justify-content: flex-end;
> .item-disc {
color: var(--dark-green-500);

26
erpnext/selling/page/point_of_sale/pos_past_order_summary.js
View File

@ -299,12 +299,12 @@ erpnext.PointOfSale.PastOrderSummary = class {
}
load_summary_of(doc, after_submission=false) {
this.toggle_summary_placeholder(false)
after_submission ?
this.$summary_wrapper.css('grid-column', 'span 10 / span 10') :
this.$summary_wrapper.css('grid-column', 'span 6 / span 6')
this.$component.css('grid-column', 'span 10 / span 10') :
this.$component.css('grid-column', 'span 6 / span 6')
this.toggle_summary_placeholder(false)
this.doc = doc;
this.attach_document_info(doc);
@ -333,9 +333,25 @@ erpnext.PointOfSale.PastOrderSummary = class {
doc.items.forEach((item, i) => {
const item_dom = this.get_item_html(doc, item);
this.$items_container.append(item_dom);
this.set_dynamic_rate_header_width();
});
}
set_dynamic_rate_header_width() {
const rate_cols = Array.from(this.$items_container.find(".item-rate-disc"));
this.$items_container.find(".item-rate-disc").css("width", "");
let max_width = rate_cols.reduce((max_width, elm) => {
if ($(elm).width() > max_width)
max_width = $(elm).width();
return max_width;
}, 0);
max_width += 1;
if (max_width == 1) max_width = "";
this.$items_container.find(".item-rate-disc").css("width", max_width);
}
attach_payments_info(doc) {
this.$payment_container.html('');
doc.payments.forEach(p => {