From 5b12c4a433129c945731b2ed7b8dd27aca23def2 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 28 Sep 2021 14:25:47 +0200
Subject: [PATCH 1/3] fix: style universal input search.
---
src/style/components/UniversalSearch.scss | 50 +++++++++--------------
1 file changed, 19 insertions(+), 31 deletions(-)
diff --git a/src/style/components/UniversalSearch.scss b/src/style/components/UniversalSearch.scss
index 2ee0a989d..aec54c91b 100644
--- a/src/style/components/UniversalSearch.scss
+++ b/src/style/components/UniversalSearch.scss
@@ -4,10 +4,8 @@
opacity: 1;
background-color: #fff;
border-radius: 3px;
- box-shadow:
- 0 0 0 1px rgba(16, 22, 26, .1),
- 0 4px 8px rgba(16, 22, 26, .2),
- 0 18px 46px 6px rgba(16, 22, 26, .2);
+ box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.1), 0 4px 8px rgba(16, 22, 26, 0.2),
+ 0 18px 46px 6px rgba(16, 22, 26, 0.2);
left: calc(50% - 250px);
top: 20vh;
width: 500px;
@@ -16,7 +14,7 @@
&.bp3-overlay-appear,
&.bp3-overlay-enter {
filter: blur(20px);
- opacity: .2
+ opacity: 0.2;
}
&.bp3-overlay-appear-active,
@@ -24,31 +22,28 @@
filter: blur(0);
opacity: 1;
transition-delay: 0;
- transition-duration: .2s;
+ transition-duration: 0.2s;
transition-property: filter, opacity;
- transition-timing-function: cubic-bezier(.4, 1, .75, .9)
+ transition-timing-function: cubic-bezier(0.4, 1, 0.75, 0.9);
}
&.bp3-overlay-exit {
filter: blur(0);
- opacity: 1
+ opacity: 1;
}
&.bp3-overlay-exit-active {
filter: blur(20px);
- opacity: .2;
+ opacity: 0.2;
transition-delay: 0;
- transition-duration: .2s;
+ transition-duration: 0.2s;
transition-property: filter, opacity;
- transition-timing-function: cubic-bezier(.4, 1, .75, .9)
+ transition-timing-function: cubic-bezier(0.4, 1, 0.75, 0.9);
}
&__omnibar {
-
.bp3-input-group {
-
.bp3-icon {
-
svg {
stroke: currentColor;
fill: none;
@@ -59,7 +54,6 @@
}
}
-
.bp3-input-group .bp3-input {
border: 0;
box-shadow: 0 0 0 0;
@@ -69,13 +63,13 @@
}
.bp3-input-group.bp3-large .bp3-input:not(:first-child) {
- padding-left: 50px;
+ padding-left: 50px !important;
}
- .bp3-input {}
+ .bp3-input {
+ }
.bp3-input-group {
-
.bp3-icon {
margin: 16px;
color: #5c707f;
@@ -100,13 +94,12 @@
color: #8499a7;
}
}
- &.bp3-intent-primary{
-
- &.bp3-active{
- background-color: rgb(235, 241, 246);
+ &.bp3-intent-primary {
+ &.bp3-active {
+ background-color: rgb(235, 241, 246);
color: #252b30;
- .bp3-menu-item-label{
+ .bp3-menu-item-label {
color: #5c7080;
}
}
@@ -125,11 +118,9 @@
flex-direction: row;
align-items: center;
}
-
}
&__type-select-overlay {
-
.bp3-button {
margin: 0 !important;
}
@@ -145,7 +136,6 @@
}
&__action {
-
&:not(:first-of-type) {
margin-left: 14px;
}
@@ -155,7 +145,6 @@
}
&--arrows {
-
.bp3-tag {
padding: 0;
text-align: center;
@@ -177,8 +166,8 @@
}
}
- &__footer {}
-
+ &__footer {
+ }
&-input-right-elements {
display: flex;
@@ -194,7 +183,6 @@
&--estimate,
&--bill,
&--receipt {
-
.amount {
color: #252b30;
}
@@ -216,4 +204,4 @@
.universal-search-overlay .bp3-overlay-backdrop {
background: rgba(0, 10, 30, 0.3);
-}
\ No newline at end of file
+}
From 2e437d7b6531fdfb5b8f128e3ee4cd5fbc1e8947 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 28 Sep 2021 17:23:38 +0200
Subject: [PATCH 2/3] fix: style universal search.
---
src/style/components/UniversalSearch.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/style/components/UniversalSearch.scss b/src/style/components/UniversalSearch.scss
index aec54c91b..01aaa5fe5 100644
--- a/src/style/components/UniversalSearch.scss
+++ b/src/style/components/UniversalSearch.scss
@@ -65,8 +65,8 @@
.bp3-input-group.bp3-large .bp3-input:not(:first-child) {
padding-left: 50px !important;
}
-
- .bp3-input {
+ .bp3-input-group.bp3-large .bp3-input:not(:last-child) {
+ padding-right: 130px !important;
}
.bp3-input-group {
From 696943153dfbd49eaa6f0e68c4ba75913495ade8 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 28 Sep 2021 18:32:30 +0200
Subject: [PATCH 3/3] feat: quick payment receive & made in action Bar.
---
src/containers/Drawers/BillDrawer/BillDetailActionsBar.js | 3 ++-
.../Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js | 3 ++-
src/containers/Purchases/Bills/BillsLanding/components.js | 2 +-
src/containers/Sales/Invoices/InvoicesLanding/components.js | 2 +-
src/lang/ar/index.json | 2 +-
src/lang/en/index.json | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js b/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js
index 65bf1a998..8a14d3795 100644
--- a/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js
+++ b/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js
@@ -59,11 +59,12 @@ function BillDetailActionsBar({
text={}
onClick={safeCallback(onEditBill)}
/>
+
}
- text={}
+ text={}
onClick={handleQuickBillPayment}
/>
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js
index 5449e1f7e..32e9b709b 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js
@@ -68,11 +68,12 @@ function InvoiceDetailActionsBar({
text={}
onClick={handleEditInvoice}
/>
+
}
- text={}
+ text={}
onClick={handleQuickPaymentInvoice}
/>
diff --git a/src/containers/Purchases/Bills/BillsLanding/components.js b/src/containers/Purchases/Bills/BillsLanding/components.js
index bd995fdfd..9cd1ec6fa 100644
--- a/src/containers/Purchases/Bills/BillsLanding/components.js
+++ b/src/containers/Purchases/Bills/BillsLanding/components.js
@@ -57,7 +57,7 @@ export function ActionsMenu({
}
- text={intl.get('payment_divider')}
+ text={intl.get('add_payment')}
onClick={safeCallback(onQuick, original)}
/>
diff --git a/src/containers/Sales/Invoices/InvoicesLanding/components.js b/src/containers/Sales/Invoices/InvoicesLanding/components.js
index b758a5cbe..2efde999e 100644
--- a/src/containers/Sales/Invoices/InvoicesLanding/components.js
+++ b/src/containers/Sales/Invoices/InvoicesLanding/components.js
@@ -131,7 +131,7 @@ export function ActionsMenu({
}
- text={intl.get('payment_divider')}
+ text={intl.get('add_payment')}
onClick={safeCallback(onQuick, original)}
/>
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 963fbbadb..8200dba9c 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -833,7 +833,7 @@
"the_payment_amount_that_received": "مبلغ الدفع الذي تم استلامه من الزبون أكبر من المبلغ المستحق لهذه الفاتورة.",
"invoice_number": "رقم الفاتورة",
"make_payment": "قم بالدفع",
- "payment_divider": "إضافة الدفع",
+ "add_payment": "إضافة الدفع",
"quick_receive_payment": "سند قبض سريع",
"amount_received": "تم استلام المبلغ",
"payment_receive_number_required": "مطلوب رقم استلام الدفعة",
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index 320b6b16c..1ffcc604b 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -820,7 +820,7 @@
"invoice_date": "Invoice date",
"invoice_amount": "Invoice amount",
"make_payment": "Make Payment",
- "payment_divider": "Payment divider",
+"add_payment": "Add Payment",
"quick_receive_payment": "Quick Receive Payment",
"amount_received": "Amount Received",
"payment_no": "Payment No.",