Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch hotfix into develop #1391

Merged
merged 6 commits into from
Jun 21, 2021
Merged

Merge branch hotfix into develop #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eeee9dd
Merge pull request #1354 from Bloomstack/hotfix
sahil28297 Jun 3, 2021
ec44a44
Merge pull request #1376 from Bloomstack/develop
sahil28297 Jun 9, 2021
24407df
bumped to version 2.3.0
sahil28297 Jun 9, 2021
0c6c87b
Merge branch 'staging' into production
sahil28297 Jun 9, 2021
a347687
Merge pull request #1380 from Bloomstack/production
DeveloperMetal Jun 11, 2021
f65f34d
fix: Allow card processing on guests when they are sent payment reque…
DeveloperMetal Jun 11, 2021
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 erpnext/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from frappe.utils import getdate

__erpnext_version__ = '12.10.1'
__version__ = '2.2.2'
__version__ = '2.3.0'

def get_default_company(user=None):
'''Get default company for user'''
Expand Down
4 changes: 2 additions & 2 deletions erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def query_successful_authnet_transaction(request):
return transaction
return False

@frappe.whitelist()
@frappe.whitelist(allow_guest=True)
def get_status(data):
if isinstance(data, str):
data = json.loads(data)
Expand Down Expand Up @@ -231,7 +231,7 @@ def get_status(data):
}


@frappe.whitelist()
@frappe.whitelist(allow_guest=True)
def charge_credit_card(card, data):
"""
Charge a credit card
Expand Down