mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-20 14:50:32 +00:00
Merge branch 'develop' of https://github.com/BigcapitalTech/bigcapital-client into develop
This commit is contained in:
@@ -59,11 +59,12 @@ function BillDetailActionsBar({
|
|||||||
text={<T id={'edit_bill'} />}
|
text={<T id={'edit_bill'} />}
|
||||||
onClick={safeCallback(onEditBill)}
|
onClick={safeCallback(onEditBill)}
|
||||||
/>
|
/>
|
||||||
|
<NavbarDivider />
|
||||||
<If condition={bill.is_open && !bill.is_fully_paid}>
|
<If condition={bill.is_open && !bill.is_fully_paid}>
|
||||||
<Button
|
<Button
|
||||||
className={Classes.MINIMAL}
|
className={Classes.MINIMAL}
|
||||||
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
||||||
text={<T id={'payment_divider'} />}
|
text={<T id={'add_payment'} />}
|
||||||
onClick={handleQuickBillPayment}
|
onClick={handleQuickBillPayment}
|
||||||
/>
|
/>
|
||||||
</If>
|
</If>
|
||||||
|
|||||||
@@ -68,11 +68,12 @@ function InvoiceDetailActionsBar({
|
|||||||
text={<T id={'edit_invoice'} />}
|
text={<T id={'edit_invoice'} />}
|
||||||
onClick={handleEditInvoice}
|
onClick={handleEditInvoice}
|
||||||
/>
|
/>
|
||||||
|
<NavbarDivider />
|
||||||
<If condition={invoice.is_delivered && !invoice.is_fully_paid}>
|
<If condition={invoice.is_delivered && !invoice.is_fully_paid}>
|
||||||
<Button
|
<Button
|
||||||
className={Classes.MINIMAL}
|
className={Classes.MINIMAL}
|
||||||
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
||||||
text={<T id={'payment_divider'} />}
|
text={<T id={'add_payment'} />}
|
||||||
onClick={handleQuickPaymentInvoice}
|
onClick={handleQuickPaymentInvoice}
|
||||||
/>
|
/>
|
||||||
</If>
|
</If>
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ export function ActionsMenu({
|
|||||||
<If condition={original.is_open && !original.is_fully_paid}>
|
<If condition={original.is_open && !original.is_fully_paid}>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
||||||
text={intl.get('payment_divider')}
|
text={intl.get('add_payment')}
|
||||||
onClick={safeCallback(onQuick, original)}
|
onClick={safeCallback(onQuick, original)}
|
||||||
/>
|
/>
|
||||||
</If>
|
</If>
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ export function ActionsMenu({
|
|||||||
<If condition={original.is_delivered && !original.is_fully_paid}>
|
<If condition={original.is_delivered && !original.is_fully_paid}>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
icon={<Icon icon="quick-payment-16" iconSize={16} />}
|
||||||
text={intl.get('payment_divider')}
|
text={intl.get('add_payment')}
|
||||||
onClick={safeCallback(onQuick, original)}
|
onClick={safeCallback(onQuick, original)}
|
||||||
/>
|
/>
|
||||||
</If>
|
</If>
|
||||||
|
|||||||
@@ -833,7 +833,7 @@
|
|||||||
"the_payment_amount_that_received": "مبلغ الدفع الذي تم استلامه من الزبون أكبر من المبلغ المستحق لهذه الفاتورة.",
|
"the_payment_amount_that_received": "مبلغ الدفع الذي تم استلامه من الزبون أكبر من المبلغ المستحق لهذه الفاتورة.",
|
||||||
"invoice_number": "رقم الفاتورة",
|
"invoice_number": "رقم الفاتورة",
|
||||||
"make_payment": "قم بالدفع",
|
"make_payment": "قم بالدفع",
|
||||||
"payment_divider": "إضافة دفع",
|
"add_payment": "إضافة دفع",
|
||||||
"quick_receive_payment": "سند قبض سريع",
|
"quick_receive_payment": "سند قبض سريع",
|
||||||
"amount_received": "تم استلام المبلغ",
|
"amount_received": "تم استلام المبلغ",
|
||||||
"payment_receive_number_required": "مطلوب رقم استلام الدفعة",
|
"payment_receive_number_required": "مطلوب رقم استلام الدفعة",
|
||||||
|
|||||||
@@ -820,7 +820,7 @@
|
|||||||
"invoice_date": "Invoice date",
|
"invoice_date": "Invoice date",
|
||||||
"invoice_amount": "Invoice amount",
|
"invoice_amount": "Invoice amount",
|
||||||
"make_payment": "Make Payment",
|
"make_payment": "Make Payment",
|
||||||
"payment_divider": "Payment divider",
|
"add_payment": "Add Payment",
|
||||||
"quick_receive_payment": "Quick Receive Payment",
|
"quick_receive_payment": "Quick Receive Payment",
|
||||||
"amount_received": "Amount Received",
|
"amount_received": "Amount Received",
|
||||||
"payment_no": "Payment No.",
|
"payment_no": "Payment No.",
|
||||||
|
|||||||
@@ -4,10 +4,8 @@
|
|||||||
opacity: 1;
|
opacity: 1;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
box-shadow:
|
box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.1), 0 4px 8px rgba(16, 22, 26, 0.2),
|
||||||
0 0 0 1px rgba(16, 22, 26, .1),
|
0 18px 46px 6px rgba(16, 22, 26, 0.2);
|
||||||
0 4px 8px rgba(16, 22, 26, .2),
|
|
||||||
0 18px 46px 6px rgba(16, 22, 26, .2);
|
|
||||||
left: calc(50% - 250px);
|
left: calc(50% - 250px);
|
||||||
top: 20vh;
|
top: 20vh;
|
||||||
width: 500px;
|
width: 500px;
|
||||||
@@ -16,7 +14,7 @@
|
|||||||
&.bp3-overlay-appear,
|
&.bp3-overlay-appear,
|
||||||
&.bp3-overlay-enter {
|
&.bp3-overlay-enter {
|
||||||
filter: blur(20px);
|
filter: blur(20px);
|
||||||
opacity: .2
|
opacity: 0.2;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.bp3-overlay-appear-active,
|
&.bp3-overlay-appear-active,
|
||||||
@@ -24,31 +22,28 @@
|
|||||||
filter: blur(0);
|
filter: blur(0);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transition-delay: 0;
|
transition-delay: 0;
|
||||||
transition-duration: .2s;
|
transition-duration: 0.2s;
|
||||||
transition-property: filter, opacity;
|
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 {
|
&.bp3-overlay-exit {
|
||||||
filter: blur(0);
|
filter: blur(0);
|
||||||
opacity: 1
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.bp3-overlay-exit-active {
|
&.bp3-overlay-exit-active {
|
||||||
filter: blur(20px);
|
filter: blur(20px);
|
||||||
opacity: .2;
|
opacity: 0.2;
|
||||||
transition-delay: 0;
|
transition-delay: 0;
|
||||||
transition-duration: .2s;
|
transition-duration: 0.2s;
|
||||||
transition-property: filter, opacity;
|
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 {
|
&__omnibar {
|
||||||
|
|
||||||
.bp3-input-group {
|
.bp3-input-group {
|
||||||
|
|
||||||
.bp3-icon {
|
.bp3-icon {
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
stroke: currentColor;
|
stroke: currentColor;
|
||||||
fill: none;
|
fill: none;
|
||||||
@@ -59,7 +54,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.bp3-input-group .bp3-input {
|
.bp3-input-group .bp3-input {
|
||||||
border: 0;
|
border: 0;
|
||||||
box-shadow: 0 0 0 0;
|
box-shadow: 0 0 0 0;
|
||||||
@@ -69,13 +63,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.bp3-input-group.bp3-large .bp3-input:not(:first-child) {
|
.bp3-input-group.bp3-large .bp3-input:not(:first-child) {
|
||||||
padding-left: 50px;
|
padding-left: 50px !important;
|
||||||
|
}
|
||||||
|
.bp3-input-group.bp3-large .bp3-input:not(:last-child) {
|
||||||
|
padding-right: 130px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bp3-input {}
|
|
||||||
|
|
||||||
.bp3-input-group {
|
.bp3-input-group {
|
||||||
|
|
||||||
.bp3-icon {
|
.bp3-icon {
|
||||||
margin: 16px;
|
margin: 16px;
|
||||||
color: #5c707f;
|
color: #5c707f;
|
||||||
@@ -100,13 +94,12 @@
|
|||||||
color: #8499a7;
|
color: #8499a7;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.bp3-intent-primary{
|
&.bp3-intent-primary {
|
||||||
|
&.bp3-active {
|
||||||
&.bp3-active{
|
background-color: rgb(235, 241, 246);
|
||||||
background-color: rgb(235, 241, 246);
|
|
||||||
color: #252b30;
|
color: #252b30;
|
||||||
|
|
||||||
.bp3-menu-item-label{
|
.bp3-menu-item-label {
|
||||||
color: #5c7080;
|
color: #5c7080;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -125,11 +118,9 @@
|
|||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__type-select-overlay {
|
&__type-select-overlay {
|
||||||
|
|
||||||
.bp3-button {
|
.bp3-button {
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
}
|
}
|
||||||
@@ -145,7 +136,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__action {
|
&__action {
|
||||||
|
|
||||||
&:not(:first-of-type) {
|
&:not(:first-of-type) {
|
||||||
margin-left: 14px;
|
margin-left: 14px;
|
||||||
}
|
}
|
||||||
@@ -155,7 +145,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&--arrows {
|
&--arrows {
|
||||||
|
|
||||||
.bp3-tag {
|
.bp3-tag {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@@ -177,8 +166,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__footer {}
|
&__footer {
|
||||||
|
}
|
||||||
|
|
||||||
&-input-right-elements {
|
&-input-right-elements {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -194,7 +183,6 @@
|
|||||||
&--estimate,
|
&--estimate,
|
||||||
&--bill,
|
&--bill,
|
||||||
&--receipt {
|
&--receipt {
|
||||||
|
|
||||||
.amount {
|
.amount {
|
||||||
color: #252b30;
|
color: #252b30;
|
||||||
}
|
}
|
||||||
@@ -216,4 +204,4 @@
|
|||||||
|
|
||||||
.universal-search-overlay .bp3-overlay-backdrop {
|
.universal-search-overlay .bp3-overlay-backdrop {
|
||||||
background: rgba(0, 10, 30, 0.3);
|
background: rgba(0, 10, 30, 0.3);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user