Commit graph

291 commits

Author SHA1 Message Date
Faris Ansari
467bd8a8ad fix: Remove no_sitemap flag 2019-03-19 20:34:19 +05:30
Saurabh
087e401c78 Customize payment success message (#6460)
* Provision to set custom payment success message

* typo fix

* Fix formatting
2018-11-29 09:07:38 +05:30
Saurabh
4f4706ae12 [fix] do not cache payment success page 2018-10-25 14:11:32 +05:30
Charles-Henri Decultot
278dfe44f5 Improve checkout UX (#6248) 2018-10-15 09:27:08 +05:30
Saurabh
4eedf52560 [fix] if redirect uri exists then automatically redirect the user 2018-10-11 17:49:37 +05:30
Saurabh
54e575b824 [fix] minor-fixes 2018-10-01 11:35:13 +05:30
Saurabh
05b4f21016 setup addons on razorpay 2018-10-01 11:35:13 +05:30
Saurabh
2749f0ebbf Support for razorpay subscription and addons 2018-10-01 11:35:13 +05:30
Rushabh Mehta
aae580a53d [style] make page-card self contained 2018-07-10 18:36:58 +05:30
Rushabh Mehta
a4dd9ec91b [test] [style] 2018-07-10 16:10:08 +05:30
Charles-Henri Decultot
27b4b86b27 Stripe corrections (#5700) 2018-06-21 09:09:05 +05:30
Charles-Henri Decultot
959784b744 Subscriptions + Elements for Stripe payments (#5602)
* Stripe Payments Improvements

* Automatically create a new stripe customer

* Charge arguments correction

* Move Stripe to ERPNext

* Revert "Move Stripe to ERPNext"

This reverts commit f71f9952997ea0fcdccafc2410abafb6185a6a1f.

* Stripe Settings correction

* Payment plan moved to ERPNext

* Remove Reference to payment plan in Frappe

* Remove references to payment plan in Frappe

* Modify Stripe Checkout Pages to allow usage without ERPNext
2018-06-11 15:13:29 +05:30
Charles-Henri Decultot
85bd024b12 Allow several Stripe accounts (#5573)
* Allow several Stripe accounts

* Addition of a sync patch

* Remove unused dependancy
2018-05-23 11:16:21 +05:30
Charles-Henri Decultot
68720c2a4f [New Feature] Google Calendar Connector (#5266)
* Addition of a filter for last sync timestamp

* Google calendar connector wip

* Google calendar integration

* Add test for account creation

* Codacy corrections

* Remove unused import

* New section Google Services

* Add no_copy to migration custom field
2018-04-06 10:43:49 +05:30
Achilles Rasquinha
0fc518ace4 python 3 fixes 2018-03-31 18:15:43 +05:30
Charles-Henri Decultot
41598d22f0 Braintree integration (#4971)
* Braintree Integration WIP

* Braintree integration

* Link in config + settings after save

* Code cleanup

* Code cleanup

* JS beautify issue

* Codacy corrections

* Spaces to tabs
2018-02-16 15:16:23 +05:30
Britlog
07c0f4fd99 Stripe translations (#4892) 2018-01-23 14:34:11 +05:30
Saurabh
52d1e7300b [fix] generate token while initiating razorpay payment and accept payment against the token. do not pass payment arguments in url, user can modify payment parameters (#4269) 2017-10-06 17:23:12 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Rushabh Mehta
b6ac024576 [style] make payment pages standard (#3655) 2017-07-11 10:56:01 +05:30
Nabin Hait
d6654f4fe3 Fixed merge conflict 2017-05-18 14:03:14 +05:30
Alchez
47321e4821 [Minor] Fixed unclosed h2 tag (#3267) 2017-05-11 15:39:25 +05:30
Saurabh
286b79bd90 Stripe payment integration (#2867)
* [fix] setting page for stripe

* checkout flow for stripe payment

* controller to handle stripe checkout and authorization
2017-04-06 17:27:23 +05:30
Saurabh
3952338b73 [urgent][fix] convert use_sandbox param to integer to avoid false data sandboxing (#2384) 2016-11-28 12:37:33 +05:30
Saurabh
9ff094d8de [fix] paypal sandboxing to test dummy payments (#2281)
* [fix] paypal sandboxing to test dummy payments

* [fix] sandbox testing for razorpay
2016-11-10 09:58:56 +05:30
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Rushabh Mehta
290897f849 [minor] wait for razorpay to complete the payment 2016-10-06 11:07:06 +05:30
Rushabh Mehta
7101066f1f [fixes] for razorpay 2016-10-04 16:11:16 +05:30
Saurabh
25015aba96 [minor][fix] erpnext-logo on rzorpay dialogue 2016-09-30 18:23:33 +05:30
Saurabh
18c62f0470 Integration broker (#1968)
* [enhancement] integration borker and controller

* [minor][fix] parameter naming changes

* [fix] common scheduler for integration service

* [fix] integrations

* [patch] patch to move payment gateway in Integration Service

* [fix] add payment success, cancel and failuer handling pages

* [enhancment] dropbox integration merged in integration services

* provision to add custom parameters

* [fixes] patch fix to setup dropbox settings

* [fixes] removed dropbox backup, api usage note for paypal and razorpay

* [minor][fix] deprecate service events

* [fix] return type fix for checkout urls

* [fix] add custom settings via patch for dropbox backup frequency

* [fix] remove gride editting

* [enhance] ldap based login

* [enhance] login via ldap credentails

* [commit] remove parameter table, save params as json dict
2016-09-09 11:15:18 +05:30
Anand Doshi
87da8abd6a [feature] robots.txt - uses Website Settings or frappe.local.conf.robots_txt (file path) 2016-06-29 13:25:43 +05:30
Rushabh Mehta
0cb31006e5 [redesign] website route is evaluated on request, no cold start 2016-06-23 12:23:37 +05:30
Rushabh Mehta
f81632b9d9 [redesign] removed website statics, www served like templates/pages 2016-06-23 10:54:31 +05:30
Rushabh Mehta
9d8812e15b [minor] send standard print format if the name is old 2016-06-22 11:21:43 +05:30
Anand Doshi
8d18bc484e [fix] show password strenght indicator in update password page 2016-06-16 17:42:07 +05:30
Anand Doshi
831c3021f3 [fix] letterhead and background-image url in pdf 2016-06-13 18:50:41 +05:30
Rushabh Mehta
6824df7ac9 [cleanup] rename functions in website and router for cleaner meaning 2016-05-29 14:25:49 +05:30
Rushabh Mehta
4808df2a1f [am] set __unedited only if added via grid 2016-05-23 11:28:55 +05:30
Rushabh Mehta
3eb8634904 [cleanup] website / portal css 2016-05-20 16:36:38 +05:30
Rushabh Mehta
701732b687 [fix] block module fix and quick entry for name 2016-05-13 17:32:00 +05:30
Kanchan Chauhan
eeb7da7c05 Blog webpages cleanup 2016-05-04 23:13:22 +05:30
Kanchan Chauhan
6b366d9ab9 Website makeover 2016-05-02 12:03:29 +05:30
Kanchan Chauhan
f5f6c36e12 [Minor] Social Logins fixed 2016-04-27 12:35:10 +05:30
Anand Doshi
9c5e1199de [css] cleanup + moved products and homepage to erpnext + [fix] get_js 2016-04-22 18:52:47 +05:30
Kanchan Chauhan
0e0789ae00 Website Changes 2016-04-22 17:46:48 +05:30
Anand Doshi
bc4ab6bb71 [feature] Redirect to message page with a detailed message 2016-04-21 20:42:11 +05:30
Rushabh Mehta
ba8416054c [fix] full width for pages with sidebar 2016-04-21 14:17:55 +05:30
Rushabh Mehta
e9847476d1 [cleanup] [web] styles 2016-04-21 13:10:33 +05:30
Kanchan Chauhan
1e7ddf4404 Changes 3 2016-04-20 16:23:09 +05:30