Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bind callback callback for realtime event

Browse Source
This commit is contained in:
Mangesh-Khairnar 2020-09-23 15:55:21 +05:30
parent 97ab96c8bf
commit 4eb215badb
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/payment_request/payment_request.py
View File

@ -84,11 +84,10 @@ class PaymentRequest(Document):
elif self.payment_channel == "Phone": elif self.payment_channel == "Phone":
controller = get_payment_gateway_controller(self.payment_gateway) controller = get_payment_gateway_controller(self.payment_gateway)
payment_record = dict( payment_record = dict(
reference_doctype=self.reference_doctype, reference_doctype="Payment Request",
reference_docname=self.reference_name, reference_docname=self.name,
grand_total=self.grand_total, grand_total=self.grand_total,
sender=self.email_to, sender=self.email_to,
payment_request_name=self.name,
currency=self.currency, currency=self.currency,
payment_gateway=self.payment_gateway payment_gateway=self.payment_gateway
) )

17
erpnext/accounts/doctype/pos_invoice/pos_invoice.js
View File

@ -142,6 +142,23 @@ erpnext.selling.POSInvoiceController = erpnext.selling.SellingController.extend(
frm: cur_frm frm: cur_frm
}) })
}, },
request_for_payment: function (frm) {
frm.save().then(() => {
frappe.dom.freeze();
frappe.call({
method: 'create_payment_request',
doc: frm.doc,
})
.fail(() => {
frappe.dom.unfreeze();
frappe.msgprint('Payment request failed');
})
.then(() => {
frappe.msgprint('Payment request sent successfully');
});
});
}
}) })
$.extend(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm })) $.extend(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }))

18
erpnext/selling/page/point_of_sale/pos_payment.js
View File

@ -174,6 +174,24 @@ erpnext.PointOfSale.Payment = class {
} }
}) })
frappe.realtime.on("process_phone_payments", function(data) {
frappe.msgprint({message: 'help', title:'now'})
// frappe.dom.unfreeze();
// let message = data["ResultDesc"];
// let title = __("Payment Failed");
// const frm = me.events.get_frm();
// if (data["ResultCode"] == 0) {
// title = __("Payment Received");
// $('[data-fieldname=request_for_payment]').text("Paid")
// }
// frappe.msgprint({
// "message": message,
// "title": title
// });
});
this.$payment_modes.on('click', '.shortcut', function(e) { this.$payment_modes.on('click', '.shortcut', function(e) {
const value = $(this).attr('data-value'); const value = $(this).attr('data-value');
me.selected_mode.set_value(value); me.selected_mode.set_value(value);