Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ charset = utf-8

# python, js indentation settings
[{*.py,*.js,*.vue,*.css,*.scss,*.html}]
indent_style = tab
indent_style = space
indent_size = 4
max_line_length = 110

Expand Down
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@

# Reformatting
b30fc5128304b4f806087d7abc8269aa4b76703d

# tabs to spaces
2a0bfb14e15b112db56348a4d5b063f00a431d96
22 changes: 11 additions & 11 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module.exports = {
parserPreset: "conventional-changelog-conventionalcommits",
rules: {
"subject-empty": [2, "never"],
"type-case": [2, "always", "lower-case"],
"type-empty": [2, "never"],
"type-enum": [
2,
"always",
["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test"],
],
},
parserPreset: "conventional-changelog-conventionalcommits",
rules: {
"subject-empty": [2, "never"],
"type-case": [2, "always", "lower-case"],
"type-empty": [2, "never"],
"type-enum": [
2,
"always",
["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test"],
],
},
};
84 changes: 42 additions & 42 deletions razorpayx_integration/public/js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,49 @@ frappe.provide("razorpayx");
const RAZORPAYX_CONFIG = "RazorpayX Configuration";
const DESCRIPTION_REGEX = /^[a-zA-Z0-9 ]{1,30}$/;
const PAYOUT_STATUS = {
"Not Initiated": "grey",
Queued: "yellow",
Pending: "yellow",
Scheduled: "yellow",
Processing: "blue",
Processed: "green",
Failed: "red",
Cancelled: "red",
Rejected: "red",
Reversed: "red",
"Not Initiated": "grey",
Queued: "yellow",
Pending: "yellow",
Scheduled: "yellow",
Processing: "blue",
Processed: "green",
Failed: "red",
Cancelled: "red",
Rejected: "red",
Reversed: "red",
};

Object.assign(razorpayx, {
RAZORPAYX_CONFIG,

PAYOUT_STATUS,

async get_razorpayx_config(bank_account, fields = "name") {
const response = await frappe.db.get_value(
RAZORPAYX_CONFIG,
{ bank_account: bank_account, disabled: 0 },
fields
);

return response.message;
},

is_payout_via_razorpayx(doc) {
return (
doc.make_bank_online_payment &&
doc.integration_doctype === RAZORPAYX_CONFIG &&
doc.integration_docname
);
},

validate_payout_description(description) {
if (!description || DESCRIPTION_REGEX.test(description)) return;

frappe.throw({
message: __(
"Must be <strong>alphanumeric</strong> and contain <strong>spaces</strong> only, with a maximum of <strong>30</strong> characters."
),
title: __("Invalid RazorpayX Payout Description"),
});
},
RAZORPAYX_CONFIG,

PAYOUT_STATUS,

async get_razorpayx_config(bank_account, fields = "name") {
const response = await frappe.db.get_value(
RAZORPAYX_CONFIG,
{ bank_account: bank_account, disabled: 0 },
fields
);

return response.message;
},

is_payout_via_razorpayx(doc) {
return (
doc.make_bank_online_payment &&
doc.integration_doctype === RAZORPAYX_CONFIG &&
doc.integration_docname
);
},

validate_payout_description(description) {
if (!description || DESCRIPTION_REGEX.test(description)) return;

frappe.throw({
message: __(
"Must be <strong>alphanumeric</strong> and contain <strong>spaces</strong> only, with a maximum of <strong>30</strong> characters."
),
title: __("Invalid RazorpayX Payout Description"),
});
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,46 @@
const SYNC_BTN_LABEL = __("Sync via RazorpayX");

frappe.ui.form.on("Bank Reconciliation Tool", {
refresh: async function (frm) {
frm.add_custom_button(SYNC_BTN_LABEL, async () => {
await sync_transactions_with_razorpayx(frm.doc.bank_account, frm.__razorpayx_config);

frappe.show_alert({
message: __("<strong>{0}</strong> transactions synced successfully!", [frm.doc.bank_account]),
indicator: "green",
});
});

await toggle_sync_btn(frm);
},

bank_account: async function (frm) {
await toggle_sync_btn(frm);
},
refresh: async function (frm) {
frm.add_custom_button(SYNC_BTN_LABEL, async () => {
await sync_transactions_with_razorpayx(frm.doc.bank_account, frm.__razorpayx_config);

frappe.show_alert({
message: __("<strong>{0}</strong> transactions synced successfully!", [frm.doc.bank_account]),
indicator: "green",
});
});

await toggle_sync_btn(frm);
},

bank_account: async function (frm) {
await toggle_sync_btn(frm);
},
});

function sync_transactions_with_razorpayx(bank_account, razorpayx_config) {
return frappe.call({
method: "razorpayx_integration.razorpayx_integration.utils.bank_transaction.sync_transactions_for_reconcile",
args: { bank_account, razorpayx_config },
freeze: true,
freeze_message: __("Syncing Transactions. Please wait it may take a while..."),
});
return frappe.call({
method: "razorpayx_integration.razorpayx_integration.utils.bank_transaction.sync_transactions_for_reconcile",
args: { bank_account, razorpayx_config },
freeze: true,
freeze_message: __("Syncing Transactions. Please wait it may take a while..."),
});
}

async function toggle_sync_btn(frm) {
const btn = frm.custom_buttons[SYNC_BTN_LABEL];
const btn = frm.custom_buttons[SYNC_BTN_LABEL];

if (!btn) return;
if (!btn) return;

if (!frm.doc.bank_account) {
btn.hide();
return;
}
if (!frm.doc.bank_account) {
btn.hide();
return;
}

const { name } = await razorpayx.get_razorpayx_config(frm.doc.bank_account);
frm.__razorpayx_config = name;
const { name } = await razorpayx.get_razorpayx_config(frm.doc.bank_account);
frm.__razorpayx_config = name;

if (name) btn.show();
else btn.hide();
if (name) btn.show();
else btn.hide();
}
Loading