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-04 14:18:17 +05:30
commit be9550955f
3 changed files with 26 additions and 59 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

@ -75,22 +75,14 @@
background-color: var(--gray-50);
}
.sticky-element {
position: sticky;
top: -1px;
z-index: 1;
}
> .items-selector {
@extend .pos-card;
grid-column: span 6 / span 6;
display: flex;
flex-direction: column;
overflow-y: scroll;
overflow-x: hidden;
overflow: hidden;
> .filter-section {
@extend .sticky-element;
display: grid;
grid-template-columns: repeat(12, minmax(0, 1fr));
background-color: var(--fg-color);
@ -124,6 +116,14 @@
gap: var(--margin-lg);
padding: var(--padding-lg);
padding-top: var(--padding-xs);
overflow-y: scroll;
overflow-x: hidden;
&:after {
content: "";
display: block;
height: 1px;
}
> .item-wrapper {
@extend .pointer-no-select;
@ -185,6 +185,7 @@
display: flex;
flex-direction: column;
padding: var(--padding-md) var(--padding-lg);
overflow: hidden;
> .customer-field {
display: flex;
@ -193,7 +194,6 @@
}
> .customer-details {
@extend .sticky-element;
display: flex;
flex-direction: column;
background-color: var(--fg-color);
@ -284,6 +284,11 @@
> .customer-transactions {
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
margin-right: -12px;
padding-right: 12px;
margin-left: -10px;
> .no-transactions-placeholder {
height: 100%;
@ -899,11 +904,9 @@
grid-column: span 4 / span 4;
display: none;
flex-direction: column;
overflow-y: scroll;
overflow-x: hidden;
overflow: hidden;
> .filter-section {
@extend .sticky-element;
display: flex;
flex-direction: column;
background-color: var(--fg-color);
@ -927,17 +930,17 @@
> .invoices-container {
padding: var(--padding-lg);
padding-top: 0px;
overflow-x: hidden;
overflow-y: scroll;
}
}
> .past-order-summary {
// @extend .pos-card;
display: none;
grid-column: span 6 / span 6;
flex-direction: column;
align-items: center;
justify-content: center;
// padding: var(--padding-lg);
> .no-summary-placeholder {
display: flex;
@ -1029,14 +1032,12 @@
align-items: center;
justify-content: space-between;
padding: var(--padding-sm) var(--padding-md);
// border-bottom: 1px solid var(--gray-300);
}
> .taxes-wrapper {
display: flex;
flex-direction: column;
padding: 0px var(--padding-md);
// border-bottom: 1px solid var(--gray-300);
> .tax-row {
display: flex;
@ -1050,7 +1051,6 @@
display: flex;
align-items: center;
padding: var(--padding-sm) var(--padding-md);
// border-bottom: 1px solid var(--gray-300);
> .item-name {
@extend .nowrap;
@ -1081,9 +1081,7 @@
}
> .grand-total {
// font-size: var(--text-lg);
font-weight: 700;
// padding: var(--padding-md);
}
> .payments {

39
erpnext/selling/page/point_of_sale/pos_controller.js
View File

@ -118,28 +118,11 @@ erpnext.PointOfSale.Controller = class {
this.make_app();
}
set_opening_entry_status() {
this.page.set_title_sub(
`<span class="indicator orange">
<a class="text-muted" href="/desk/Form/POS%20Opening%20Entry/${this.pos_opening}">
Opened at ${moment(this.pos_opening_time).format("Do MMMM, h:mma")}
</a>
</span>`);
}
make_app() {
return frappe.run_serially([
() => frappe.dom.freeze(),
() => {
this.set_opening_entry_status();
this.prepare_dom();
this.prepare_components();
this.prepare_menu();
},
() => this.make_new_invoice(),
() => frappe.dom.unfreeze(),
() => this.page.set_title(__('Point of Sale')),
]);
this.prepare_dom();
this.prepare_components();
this.prepare_menu();
this.make_new_invoice();
}
prepare_dom() {
@ -416,8 +399,6 @@ erpnext.PointOfSale.Controller = class {
})
}
toggle_recent_order_list(show) {
this.toggle_components(!show);
this.recent_order_list.toggle_component(show);
@ -434,10 +415,12 @@ erpnext.PointOfSale.Controller = class {
make_new_invoice() {
return frappe.run_serially([
() => frappe.dom.freeze(),
() => this.make_sales_invoice_frm(),
() => this.set_pos_profile_data(),
() => this.set_pos_profile_status(),
() => this.cart.load_invoice(),
() => frappe.dom.unfreeze()
]);
}
@ -494,16 +477,6 @@ erpnext.PointOfSale.Controller = class {
return this.frm.trigger("set_pos_data");
}
raise_exception_for_pos_profile() {
setTimeout(() => frappe.set_route('List', 'POS Profile'), 2000);
frappe.throw(__("POS Profile is required to use Point-of-Sale"));
}
set_invoice_status() {
const [status, indicator] = frappe.listview_settings["POS Invoice"].get_indicator(this.frm.doc);
this.page.set_indicator(status, indicator);
}
set_pos_profile_status() {
this.page.set_indicator(this.pos_profile, "blue");
}

8
erpnext/selling/page/point_of_sale/pos_item_cart.js
View File

@ -791,9 +791,7 @@ erpnext.PointOfSale.ItemCart = class {
this.$cart_container.css('display', 'none');
this.$customer_section.css({
'height': '100%',
'padding-top': '0px',
'overflow-x': 'hidden',
'overflow-y': 'scroll'
'padding-top': '0px'
});
this.$customer_section.find('.customer-details').html(
`<div class="header">
@ -829,9 +827,7 @@ erpnext.PointOfSale.ItemCart = class {
this.$cart_container.css('display', 'flex');
this.$customer_section.css({
'height': '',
'padding-top': '',
'overflow-x': '',
'overflow-y': ''
'padding-top': ''
});
this.update_customer_section();