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

feat: number pad in payment screen

Browse Source
This commit is contained in:
Saqib Ansari 2020-11-23 16:38:32 +05:30
parent fa0ef218dd
commit 69ef766a93
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -747,7 +747,8 @@
> .payment-modes { > .payment-modes {
display: flex; display: flex;
margin-bottom: var(--margin-md); padding-bottom: var(--padding-sm);
margin-bottom: var(--margin-xs);
overflow-x: scroll; overflow-x: scroll;
overflow-y: hidden; overflow-y: hidden;
@ -803,10 +804,37 @@
} }
} }
.invoice-fields { > .fields-numpad-container {
display: none; display: flex;
grid-template-columns: repeat(2, minmax(0, 1fr)); flex: 1;
column-gap: var(--padding-md);
> .fields-section {
flex: 1;
}
> .number-pad {
flex: 1;
display: flex;
justify-content: flex-end;
align-items: flex-end;
.numpad-container {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: var(--margin-md);
margin-bottom: var(--margin-md);
> .numpad-btn {
@extend .pointer-no-select;
border-radius: var(--border-radius-md);
display: flex;
align-items: center;
justify-content: center;
padding: var(--padding-md);
box-shadow: var(--shadow-sm);
}
}
}
} }
> .totals-section { > .totals-section {

44
erpnext/selling/page/point_of_sale/pos_payment.js
View File

@ -19,17 +19,17 @@ erpnext.PointOfSale.Payment = class {
prepare_dom() { prepare_dom() {
this.wrapper.append( this.wrapper.append(
`<section class="payment-container"> `<section class="payment-container">
<div class="section-label payment-section"> <div class="section-label payment-section">Payment Method</div>
Payment Method
<span class="ml-2 collapse-indicator mb-1" style="display: inline;">
<svg class="icon icon-sm" style=""><use class="mb-1" href="#icon-down"></use></svg>
</span>
</div>
<div class="payment-modes"></div> <div class="payment-modes"></div>
<div class="invoice-fields-section"></div> <div class="fields-numpad-container">
<div class="fields-section">
<div class="section-label">Additional Information</div>
<div class="invoice-fields"></div>
</div>
<div class="number-pad"></div>
</div>
<div class="totals-section"> <div class="totals-section">
<div class="totals"></div> <div class="totals"></div>
<div class="number-pad"></div>
</div> </div>
<div class="submit-order-btn">Complete Order</div> <div class="submit-order-btn">Complete Order</div>
</section>` </section>`
@ -39,7 +39,7 @@ erpnext.PointOfSale.Payment = class {
this.$totals_section = this.$component.find('.totals-section'); this.$totals_section = this.$component.find('.totals-section');
this.$totals = this.$component.find('.totals'); this.$totals = this.$component.find('.totals');
this.$numpad = this.$component.find('.number-pad'); this.$numpad = this.$component.find('.number-pad');
this.$invoice_fields_section = this.$component.find('.invoice-fields-section'); this.$invoice_fields_section = this.$component.find('.fields-section');
} }
make_invoice_fields_control() { make_invoice_fields_control() {
@ -47,15 +47,6 @@ erpnext.PointOfSale.Payment = class {
const fields = doc.invoice_fields; const fields = doc.invoice_fields;
if (!fields.length) return; if (!fields.length) return;
this.$invoice_fields_section.html(
`<div class="section-label">
Additional Information
<span class="ml-2 collapse-indicator mb-1" style="display: inline;">
<svg class="icon icon-sm" style=""><use class="mb-1" href="#icon-down"></use></svg>
</span>
</div>
<div class="invoice-fields"></div>`
);
this.$invoice_fields = this.$invoice_fields_section.find('.invoice-fields'); this.$invoice_fields = this.$invoice_fields_section.find('.invoice-fields');
const frm = this.events.get_frm(); const frm = this.events.get_frm();
@ -153,7 +144,6 @@ erpnext.PointOfSale.Payment = class {
// clicked one is selected then unselect it // clicked one is selected then unselect it
mode_clicked.removeClass('border-primary'); mode_clicked.removeClass('border-primary');
me.selected_mode = ''; me.selected_mode = '';
me.toggle_numpad(false);
} else { } else {
// clicked one is not selected then select it // clicked one is not selected then select it
mode_clicked.addClass('border-primary'); mode_clicked.addClass('border-primary');
@ -161,13 +151,14 @@ erpnext.PointOfSale.Payment = class {
mode_clicked.find('.cash-shortcuts').css('display', 'grid'); mode_clicked.find('.cash-shortcuts').css('display', 'grid');
me.$payment_modes.find(`.${mode}-amount`).css('display', 'none'); me.$payment_modes.find(`.${mode}-amount`).css('display', 'none');
me.$payment_modes.find(`.${mode}-name`).css('display', 'inline'); me.$payment_modes.find(`.${mode}-name`).css('display', 'inline');
me.toggle_numpad(true);
me.selected_mode = me[`${mode}_control`]; me.selected_mode = me[`${mode}_control`];
const doc = me.events.get_frm().doc; const doc = me.events.get_frm().doc;
me.selected_mode?.$input?.get(0).focus(); me.selected_mode?.$input?.get(0).focus();
const current_value = me.selected_mode?.get_value() const current_value = me.selected_mode?.get_value()
!current_value && doc.grand_total > doc.paid_amount ? me.selected_mode?.set_value(doc.grand_total - doc.paid_amount) : ''; !current_value && doc.grand_total > doc.paid_amount ? me.selected_mode?.set_value(doc.grand_total - doc.paid_amount) : '';
me.numpad_value = '';
} }
}) })
@ -231,19 +222,6 @@ erpnext.PointOfSale.Payment = class {
this[`${mode}_control`].set_value(default_mop.amount); this[`${mode}_control`].set_value(default_mop.amount);
} }
}); });
this.$component.on('click', '.invoice-fields-section', function(e) {
if ($(e.target).closest('.invoice-fields').length) return;
me.$payment_modes.css('display', 'none');
me.$invoice_fields.css('display', 'grid');
me.toggle_numpad(false);
});
this.$component.on('click', '.payment-section', () => {
this.$invoice_fields.css('display', 'none');
this.$payment_modes.css('display', 'flex');
this.toggle_numpad(true);
})
} }
attach_shortcuts() { attach_shortcuts() {