Britlog
771d37a238
Stripe translations ( #4892 )
pirms 7 gadiem
Nabin Hait
51973c2d3c
Merge branch 'develop'
pirms 7 gadiem
Nabin Hait
34808427a7
Merge branch 'develop' into staging
pirms 7 gadiem
Saurabh
4cd7c7c63b
[fix] first commit payment transaction status and then run post payment process method
pirms 7 gadiem
Saurabh
469ef7e03e
Merge branch 'hotfix'
pirms 7 gadiem
Saurabh
927cc44bac
[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 )
pirms 7 gadiem
Nabin Hait
2bb776b1b4
Merge branch 'staging'
pirms 7 gadiem
mbauskar
6a87c57fda
Merge branch 'develop' into staging
pirms 7 gadiem
maxtorete
ac74e70d0c
Fixed rounding problem in stripe integration ( #10645 )
pirms 7 gadiem
mbauskar
b3c8578f79
Merge branch 'staging'
pirms 7 gadiem
mbauskar
4310ece998
Merge branch 'develop' into staging
pirms 7 gadiem
Rushabh Mehta
81a664f091
Merge branch 'develop' into fix-urlencode
pirms 7 gadiem
Aditya Hase
6fc9baa29a
Import six.moves.urllib.parse.urlencode instead of urllib.urlencode
pirms 7 gadiem
Aditya Hase
70599ed37e
Replaced all instances of basestring with six.string_types
pirms 7 gadiem
mbauskar
c964da78b7
Merge branch 'staging'
pirms 7 gadiem
mbauskar
4af62ed3de
Merge branch 'develop' into staging
pirms 7 gadiem
omkarghaisas
2cc514ef93
Third party apps portal ( #3782 )
* Added third party apps portal page stub
* [WIP] third party apps portal page
* Added portal page third party apps
Added page to manage OAuth 2.0 active sessions
* [Fix] Typo me.html
* frappe/www/third_party_apps.
* [Fix] Added column for last log in
pirms 7 gadiem
mbauskar
c977c18d97
Merge branch 'develop'
pirms 8 gadiem
Rushabh Mehta
35bf2e1875
[style] make payment pages standard ( #3655 )
pirms 8 gadiem
mbauskar
7dace1fb2f
Merge branch 'develop'
pirms 8 gadiem
almeidapaulopt
ed7933e6fe
several throw translations ( #3441 )
* several throw translations
* small fix
* codacy fixes
* fix import _
* Create file_list.js
* Create feedback.py
pirms 8 gadiem
Nabin Hait
d9c36869ef
Merge branch 'hotfix'
pirms 8 gadiem
Nabin Hait
9dca85cbda
Fixed merge conflict
pirms 8 gadiem
Alchez
92d2ada9e1
[Minor] Fixed unclosed h2 tag ( #3267 )
pirms 8 gadiem
Nabin Hait
9e1c25d9d3
Merge branch 'develop'
pirms 8 gadiem
Saurabh
54ef55f20b
Stripe payment integration ( #2867 )
* [fix] setting page for stripe
* checkout flow for stripe payment
* controller to handle stripe checkout and authorization
pirms 8 gadiem
Nabin Hait
a2565f5927
Merge branch 'develop'
pirms 8 gadiem
Saurabh
95f6075b5e
Deprecate Integration Broker ( #2831 )
* [fix] remove razorpay from integration service
* [fix] clean-up js side integration service dependancies
* [fix] remove integration service, .py cleanup, move integration request to integration
* [fix] move oauth to integrations and deprecate integration broker
* [fix] mark services enabled and update integrations listing
* [fix] V7.1 and V7.2 integration service related pathch fixes and move payment gateway dotype to core module
* [fix] create payment gateway records if not exists
* [fix] module page for integrations
* [minor][fix] minor checks
* [fix] remove integration broker module only if not allocated to any doctype
pirms 8 gadiem
Rushabh Mehta
5d3be2c77d
[design] Redesign, cleanup Login, Message pages ( #2564 )
* [cleanup] login, message pages
* [style] cleanups
* [cleanup]
* [cleanup] update password
* [fix] name for web form (fixes edit-profile)
pirms 8 gadiem
Rushabh Mehta
338094f9ef
[feature] document versioning #2469 ( #2523 )
* [feature] document versioning #2469
* [minor] remove on_update from WebsiteGenerator
* [fix] delete shares when deleting user
* [test] don't run delete in background if test
* [fix] test_db
* [added] Deleted Document
* [fix] added track_changes in all documents
* [fix] add to deleted only if exists
* [fix] in_install flag in deleted documents
* [minor] name will always be reset
pirms 8 gadiem
Saurabh
fe61053c1e
[urgent][fix] convert use_sandbox param to integer to avoid false data sandboxing ( #2384 )
pirms 8 gadiem
Rushabh Mehta
338a0a9e58
[docs] added some style and some fixes ( #2352 )
pirms 8 gadiem
Nabin Hait
d9e0344213
Merge pull request #2316 from saurabh6790/paypal_payament_fix_central
[urgent][fix] PayPal payemnt fix
pirms 8 gadiem
Saurabh
86677ff5f8
[urgent][fix] PayPal payemnt fix
pirms 8 gadiem
Saurabh
a388c2597d
[fix] paypal sandboxing to test dummy payments ( #2281 )
* [fix] paypal sandboxing to test dummy payments
* [fix] sandbox testing for razorpay
pirms 8 gadiem
Nabin Hait
ac3520d376
Merge branch 'hotfix'
pirms 8 gadiem
Saurabh
bd81718f6f
Merge pull request #2240 from saurabh6790/hotfix
[path][fix] paypal integration
pirms 8 gadiem
Saurabh
360b5b8ff4
[path][fix] paypal integration
pirms 8 gadiem
Saurabh
8b679678a1
[fix] typo fix
pirms 8 gadiem
Rushabh Mehta
b02247e1ca
[minor]
pirms 8 gadiem
Rushabh Mehta
3739e15c91
[refactor] code for integration service scheduled events
pirms 8 gadiem
Saurabh
62e8428534
[fix] get settings attr ( #2162 )
pirms 8 gadiem
Saurabh
6c44ecf076
[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
pirms 8 gadiem
Rushabh Mehta
c99dab6807
[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
pirms 8 gadiem
Rushabh Mehta
67eb29738f
[minor] wait for razorpay to complete the payment
pirms 8 gadiem
Rushabh Mehta
8d9996fa66
[fixes] for razorpay
pirms 8 gadiem
Saurabh
6c6eb323d6
[minor][fix] erpnext-logo on rzorpay dialogue
pirms 8 gadiem
Rushabh Mehta
d18537b911
[enhance] receive payments in web form and other fixes ( #2097 )
pirms 8 gadiem
Nabin Hait
516eb2dfd3
Merge pull request #2072 from saurabh6790/razorpay_payment_page
[minor][fix] razorpay payment
pirms 8 gadiem
Saurabh
382e997904
[minor][fix] razorpay payment
pirms 8 gadiem