diff --git a/.woodpecker.yml b/.woodpecker.yml index 5036b0e..a6f593a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,5 +1,5 @@ steps: - - name: telegram_start_notify + - name: telegram start notify image: appleboy/drone-telegram settings: token: 7616010754:AAGXMf8x-roKozdT0j-bOZ1y9dmbulbKPbM @@ -11,14 +11,14 @@ steps: *Repo Link:* ${CI_REPO_URL} *Branch:* ${CI_COMMIT_BRANCH} - *Build Status:* starting + *Build Status:* *starting* *Build Link:* ${CI_PIPELINE_URL} *Commit ID:* `${CI_COMMIT_SHA:0:8}` - *Commit By:* ${CI_PREV_COMMIT_AUTHOR} - *Commit Link:* ${CI_PREV_COMMIT_URL} + *Commit By:* {{commit.author}} + *Commit Link:* {{commit.link}} *Commit Msg:* {{commit.message}} - 🙏 hopefully success Mas Bro. + 🙏 hopefully success {{commit.author}} when: branch: - master @@ -59,7 +59,7 @@ steps: branch: - master - - name: telegram_end_notify + - name: telegram failed notify image: appleboy/drone-telegram settings: token: 7616010754:AAGXMf8x-roKozdT0j-bOZ1y9dmbulbKPbM @@ -71,18 +71,43 @@ steps: *Repo Link:* ${CI_REPO_URL} *Branch:* ${CI_COMMIT_BRANCH} - *Build Status:* *${CI_PREV_PIPELINE_STATUS}* + *Build Status:* *Failed* *Build Link:* ${CI_PIPELINE_URL} *Commit ID:* `${CI_COMMIT_SHA:0:8}` - *Commit By:* ${CI_PREV_COMMIT_AUTHOR} - *Commit Link:* ${CI_PREV_COMMIT_URL} + *Commit By:* {{commit.author}} + *Commit Link:* {{commit.link}} *Commit Msg:* {{commit.message}} - {{#success build.status}} - 😎 build succeeded. Good job. - {{else}} 🙈 build failed. Fix me please, before client is aware. - {{/success}} when: + status: + - failure + - cancel + branch: + - master + + - name: telegram success notify + image: appleboy/drone-telegram + settings: + token: 7616010754:AAGXMf8x-roKozdT0j-bOZ1y9dmbulbKPbM + to: -4765409490 + message: | + 🚀 *Woodpecker CI Build Finish* 🚀 + + *Repo:* ${CI_REPO_OWNER}/${CI_REPO_NAME} + *Repo Link:* ${CI_REPO_URL} + *Branch:* ${CI_COMMIT_BRANCH} + + *Build Status:* *Success* + *Build Link:* ${CI_PIPELINE_URL} + + *Commit ID:* `${CI_COMMIT_SHA:0:8}` + *Commit By:* {{commit.author}} + *Commit Link:* {{commit.link}} + *Commit Msg:* {{commit.message}} + 😎 build succeeded. Good job {{commit.author}} + when: + status: + - success branch: - master diff --git a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx index b1b7eac..19f4dfb 100644 --- a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx +++ b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx @@ -612,10 +612,10 @@ const DetailApprovalTransaction = () => {

Full Name

{transactionDetails?.origin_name ?? ""}

-
+ {/*

Phone Number

{transactionDetails?.origin_customer?.msisdn ?? transactionDetails?.origin_msisdn}

-
+
*/}

Email

{transactionDetails?.origin_customer?.email ?? "-"}

diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx index 4328cf1..bc7306a 100644 --- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx +++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx @@ -678,11 +678,11 @@ const DetailTransaction = () => {

Full Name

{transactionDetails?.origin_name}

-
+ {/*

Phone Number

{transactionDetails?.origin_msisdn}

{transactionDetails?.origin_customer?.origin_name ?? ""}

-
+
*/}

Phone Number

{transactionDetails?.origin_customer?.msisdn ?? transactionDetails?.origin_msisdn}

diff --git a/src/pages/transfer/transferfee/blocks/AddDialog.tsx b/src/pages/transfer/transferfee/blocks/AddDialog.tsx index 13469dc..612ac36 100644 --- a/src/pages/transfer/transferfee/blocks/AddDialog.tsx +++ b/src/pages/transfer/transferfee/blocks/AddDialog.tsx @@ -114,7 +114,8 @@ const AddFeeDialog = () => { deduct_from_account: '', credit_to: '', credit_destination: '00000000-0000-0000-0000-000000000000', - credit_destination_account: '' + credit_destination_account: '', + deduct_when: 'A' }; const [formField, setFormField] = useState(initialState); @@ -389,13 +390,19 @@ const AddFeeDialog = () => { ); }; + useEffect(() => { + if (formField.status_include === 'N') { + setFormField((prev) => ({ ...prev, deduct_when: 'A' })); + } + }, [formField.status_include]); + return ( { if (!open) { - handleAddFeeDialog(open); - handleCloseDialog(); + handleAddFeeDialog(open); + handleCloseDialog(); } }} > @@ -835,6 +842,25 @@ const AddFeeDialog = () => {
+ {formField.status_include === 'Y' && ( +
+ + +
+ )}
-
-
-
{ placeholder="Enter Minimum Amount" />
-
{ placeholder="Enter Maximum Amount" />
-
-
-
{ placeholder="Enter Deduct Amount" />
-
{ placeholder="Enter Deduct Percentage" />
-
+ {formField.deduct_from === 'I' && ( +
+ +
+
setOpenDeductOrigin(!openDeductOrigin)} + > + + {customers.find((customer) => customer.id === formField.deduct_origin) + ?.username || 'Search customer...'} + +
-{formField.deduct_from === 'I' && ( -
- -
-
setOpenDeductOrigin(!openDeductOrigin)} - > - - {customers.find((customer) => customer.id === formField.deduct_origin)?.username || 'Search customer...'} - -
- - {openDeductOrigin && ( -
-
- setCustomerSearchTerm(e.target.value)} - autoComplete="off" - onClick={(e) => e.stopPropagation()} - autoFocus - /> -
-
- {customers - .filter( - (customer) => - customer.username.toLowerCase().includes(customerSearchTerm.toLowerCase()) || - customer.msisdn.includes(customerSearchTerm) - ) - .map((customer) => ( -
{ - setFormField({ ...formField, deduct_origin: customer.id }); - setOpenDeductOrigin(false); - }} - > - {customer.username} -
- ))} - {customers.filter( - (customer) => - customer.username.toLowerCase().includes(customerSearchTerm.toLowerCase()) || - customer.msisdn.includes(customerSearchTerm) - ).length === 0 && ( -
No customer found
- )} -
-
- )} -
-
-)} - - + {openDeductOrigin && ( +
+
+ setCustomerSearchTerm(e.target.value)} + autoComplete="off" + onClick={(e) => e.stopPropagation()} + autoFocus + /> +
+
+ {customers + .filter( + (customer) => + customer.username + .toLowerCase() + .includes(customerSearchTerm.toLowerCase()) || + customer.msisdn.includes(customerSearchTerm) + ) + .map((customer) => ( +
{ + setFormField({ ...formField, deduct_origin: customer.id }); + setOpenDeductOrigin(false); + }} + > + {customer.username} +
+ ))} + {customers.filter( + (customer) => + customer.username + .toLowerCase() + .includes(customerSearchTerm.toLowerCase()) || + customer.msisdn.includes(customerSearchTerm) + ).length === 0 && ( +
+ No customer found +
+ )} +
+
+ )} +
+
+ )}
+ {formField.credit_to === 'I' && ( +
+ +
+
setOpenCreditDestination(!openCreditDestination)} + > + + {customers.find( + (customer) => customer.id === formField.credit_destination + )?.username || 'Search customer...'} + +
-{formField.credit_to === 'I' && ( -
- -
-
setOpenCreditDestination(!openCreditDestination)} - > - - {customers.find((customer) => customer.id === formField.credit_destination) - ?.username || 'Search customer...'} - -
- - {openCreditDestination && ( -
-
- setCustomerSearchTerm(e.target.value)} - autoComplete="off" - onClick={(e) => e.stopPropagation()} - autoFocus - /> -
-
- {customers - .filter( - (customer) => - customer.username - .toLowerCase() - .includes(customerSearchTerm.toLowerCase()) || - customer.msisdn.includes(customerSearchTerm) - ) - .map((customer) => ( -
{ - setFormField({ - ...formField, - credit_destination: customer.id - }); - setOpenCreditDestination(false); - }} - > - {customer.username} -
- ))} - {customers.filter( - (customer) => - customer.username - .toLowerCase() - .includes(customerSearchTerm.toLowerCase()) || - customer.msisdn.includes(customerSearchTerm) - ).length === 0 && ( -
No customer found
- )} -
-
- )} -
-
-)} - - + {openCreditDestination && ( +
+
+ setCustomerSearchTerm(e.target.value)} + autoComplete="off" + onClick={(e) => e.stopPropagation()} + autoFocus + /> +
+
+ {customers + .filter( + (customer) => + customer.username + .toLowerCase() + .includes(customerSearchTerm.toLowerCase()) || + customer.msisdn.includes(customerSearchTerm) + ) + .map((customer) => ( +
{ + setFormField({ + ...formField, + credit_destination: customer.id + }); + setOpenCreditDestination(false); + }} + > + {customer.username} +
+ ))} + {customers.filter( + (customer) => + customer.username + .toLowerCase() + .includes(customerSearchTerm.toLowerCase()) || + customer.msisdn.includes(customerSearchTerm) + ).length === 0 && ( +
+ No customer found +
+ )} +
+
+ )} +
+
+ )}
-
-
- + {formField.status_include === 'Y' && ( +
+ + +
+ )}