vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into develop

Browse source
This commit is contained in:
Nabin Hait 2016-11-01 12:38:50 +05:30
commit 2772fbd12d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '7.1.3'
__version__ = '7.1.4'
__title__ = "Frappe Framework"
local = Local()

4
frappe/integrations/doctype/paypal_settings/paypal_settings.py
View file

@ -135,7 +135,7 @@ class PayPalSettings(IntegrationService):
"PAYMENTREQUEST_0_PAYMENTACTION": "SALE",
"PAYMENTREQUEST_0_AMT": amount,
"PAYMENTREQUEST_0_CURRENCYCODE": currency.upper(),
"returnUrl": get_url("/api/method/frappe.integrations.paypal.get_express_checkout_details"),
"returnUrl": get_url("/api/method/frappe.integrations.doctype.paypal_settings.paypal_settings.get_express_checkout_details"),
"cancelUrl": get_url("/payment-cancel")
})
@ -210,7 +210,7 @@ def get_express_checkout_details(token):
frappe.local.response["type"] = "redirect"
frappe.local.response["location"] = get_url( \
"/api/method/frappe.integrations.paypal.confirm_payment?token={0}".format(token))
"/api/method/frappe.integrations.doctype.paypal_settings.paypal_settings.confirm_payment?token={0}".format(token))
@frappe.whitelist(allow_guest=True, xss_safe=True)
def confirm_payment(token):

2
frappe/model/db_schema.py
View file

@ -178,7 +178,7 @@ class DbTable:
ROW_FORMAT=COMPRESSED
CHARACTER SET=utf8mb4
COLLATE=utf8mb4_unicode_ci""".format(varchar_len=varchar_len,
engine=self.meta.engine or 'InnoDB') % (self.name, add_text))
engine=self.meta.get("engine") or 'InnoDB') % (self.name, add_text))
def get_column_definitions(self):
column_list = [] + default_columns