nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: customer section on pos item cart (backport #48284) (#48285)

Browse Source 
* fix: customer section on pos item cart (#48284)

* fix: customer recent transactions

* fix: pos customer section display customer_name instead of customer name

(cherry picked from commit e1d9f863c6)

# Conflicts:
#	erpnext/public/scss/point-of-sale.scss
#	erpnext/selling/page/point_of_sale/point_of_sale.py
#	erpnext/selling/page/point_of_sale/pos_item_cart.js

* chore: resolve conflict

* chore: resolve conflict

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
This commit is contained in:
mergify[bot]
2025-06-26 23:20:38 +05:30
committed by GitHub
parent 8f47505604
commit b6e09531d7
2 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,13 +284,24 @@
grid-template-columns: repeat(2, minmax(0, 1fr));
margin-top: var(--margin-md);
column-gap: var(--padding-sm);
row-gap: var(--padding-xs);
row-gap: var(--padding-sm);
}
> .transactions-label {
@extend .label;
> .transactions-section {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: var(--margin-md);
margin-bottom: var(--margin-sm);
> .recent-transactions {
@extend .label;
}
> .last-transaction {
font-weight: 400;
font-size: var(--text-sm);
}
}
}
@@ -299,8 +310,8 @@
overflow-x: hidden;
overflow-y: scroll;
margin-right: -12px;
padding-right: 12px;
margin-left: -10px;
scrollbar-width: thin;
> .no-transactions-placeholder {
height: 100%;
@@ -611,6 +622,11 @@
background-color: var(--gray-50);
}
&.invoice-selected {
background-color: var(--control-bg);
}
> .invoice-name-customer,
> .invoice-name-date {
display: flex;
flex-direction: column;
@@ -630,6 +646,21 @@
}
}
> .invoice-name-date {
> .invoice-name {
font-size: var(--text-md);
display: flex;
align-items: center;
font-weight: 700;
}
> .invoice-date {
@extend .nowrap;
font-size: var(--text-sm);
}
}
> .invoice-total-date,
> .invoice-total-status {
display: flex;
flex-direction: column;
@@ -650,6 +681,18 @@
justify-content: right;
}
}
> .invoice-total-status {
> .invoice-total {
margin-right: 8px;
}
> .invoice-status {
display: flex;
align-items: center;
justify-content: right;
}
}
}
> .item-details-container {