Commit graph

183 commits

Author SHA1 Message Date
Saurabh
92e6ed0425 check for subscription id 2018-10-01 11:35:14 +05:30
Saurabh
c6e7fff3c4 [fix] call setup subscription and addons explicitly 2018-10-01 11:35:13 +05:30
Saurabh
f7c5a3ce26 fix for immediate subscriptions 2018-10-01 11:35:13 +05:30
Saurabh
5302af0dd1 remove debugging print statements 2018-10-01 11:35:13 +05:30
Saurabh
788943e663 finalize recurring payments for paypal 2018-10-01 11:35:13 +05:30
Saurabh
5344786737 finalize subscription razorpay 2018-10-01 11:35:13 +05:30
Saurabh
05b4f21016 setup addons on razorpay 2018-10-01 11:35:13 +05:30
Saurabh
b1bdd2f4ae Provision to cancel existing subscription 2018-10-01 11:35:13 +05:30
Saurabh
c802dd9701 setup upfront amount 2018-10-01 11:35:13 +05:30
Saurabh
b9ba7c691d [fix] razorpay subscription 2018-10-01 11:35:13 +05:30
Saurabh
d20fd4af65 Support for paypal subscription 2018-10-01 11:35:13 +05:30
Saurabh
2749f0ebbf Support for razorpay subscription and addons 2018-10-01 11:35:13 +05:30
Rohan Bansal
28d592e182 Move import inside function 2018-09-10 11:03:19 +05:30
Rohan Bansal
5c9e9d3311 Check if Google Maps is enabled when trying to get the client 2018-09-03 18:28:15 +05:30
Doridel Cahanap
acf8fd1adc Fix Backup Issue (#6039) 2018-09-03 10:57:03 +05:30
Zarrar
41d1446c04 functions already added in delivery_triip.py (#6027) 2018-08-29 16:05:47 +05:30
Saurabh
e88cbee727 add missing methods from google_maps to google_maps_settings (#6020) 2018-08-28 15:23:05 +05:30
Ameya Shenoy
fcb28d36ee Reverting file permissions (#6012) 2018-08-27 16:20:37 +05:30
Valmik
9f61c47bc1 Rename google maps doctype, add helper methods (#6001)
* rename google maps doctype, add helper methods

* fixed patch to use correct check
2018-08-27 11:13:44 +05:30
Saurabh
bece82d6ab Resolved merge conflicts 2018-08-07 12:47:01 +05:30
Ameya Shenoy
1d89dcea75
[minor][feature] make email for successful S3 backup optional 2018-08-06 22:49:37 +00:00
Ameya Shenoy
51d5577bb1
[minor][feature] make dropbox backup successful message optional 2018-08-06 22:38:40 +00:00
Charles-Henri Decultot
8fc2af64ad Allow custom confirmation page (#5835) 2018-07-19 12:50:35 +05:30
Rushabh Mehta
be61b74c2a [minor] remove check from update password, default dropbox broker 2018-07-17 18:14:57 +05:30
aherbhagya
201b193c62 An added checkbox in Dropbox setting for file upload (#5753)
* Added Custom check box for file upload

* removed half test file

* deleted test files

* deleted test files

* added patch to enable file backup in dropbox settings

* added patch to enable file backup in dropbox settings

* Update set_dropbox_file_backup.py

* Update set_dropbox_file_backup.py
2018-07-16 17:47:38 +05:30
felixvarghese
c55127f7a2 Connect to LDAP Server using StartTLS (#5784)
* Connect to LDAP Server using StartTLS

Connect to LDAP server using StartTLS for security. An option to require trusted certificates is also included.

* fix try

* remove trailing whitespace
2018-07-06 11:58:27 +05:30
KanchanChauhan
e12573db2e [Fix] Edit to Dropbox issue for private files fixed (#5730) 2018-06-27 09:36:40 +05:30
KanchanChauhan
917269129c [Fix] Dropbox issue for private files fixed (#5728) 2018-06-27 09:11:29 +05:30
Saurabh
8957600e53
Merge pull request #5703 from rohitwaghchaure/error_in_dropbox_settings
[Fix] Dropbox backup not working
2018-06-21 11:42:50 +05:30
Rohit Waghchaure
b7db543316 [Fix] Dropbox backup not working 2018-06-21 11:35:25 +05:30
Charles-Henri Decultot
27b4b86b27 Stripe corrections (#5700) 2018-06-21 09:09:05 +05:30
Rushabh Mehta
e180b41366 [fix] [test] for notification 2018-06-11 17:19:59 +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
c2b49ce572 Slack integration (#5640)
* Slack notifications

* Codacy corrections

* Slack notifications

* Codacy corrections

* Rename Email Alert to Notification

* Migration Patch

* Refactor of notification.py

* Dev cleanup

* Test correction
2018-06-11 15:11:00 +05:30
Saurabh
b5a62f1086 [Fix] dropbox client setup 2018-06-07 15:27:13 +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
Saurabh
7798dfc0d3 [fix] handle worker timeout issue while taking backup to dropbox (#5450) 2018-05-22 11:43:06 +05:30
Charles-Henri Decultot
f0ed11061d Calendar connector improvements (#5571)
* Calendar connector improvements

* Development cleanup
2018-05-21 12:21:15 +05:30
Rushabh Mehta
b4650f42a1 [minor] remove in_dialog old property 2018-05-16 12:51:01 +05:30
Faris Ansari
da3e726fde
[fix] GCalendar Account test (#5400)
* [fix] GCalendar Account test

* [py3] fix email account test

* Decode plain text files
2018-04-07 22:38:12 +05:30
Nabin Hait
944b45b62d fixed merge conflict 2018-04-06 15:05:15 +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
Saurabh
6d4d6cb8ca check whether file path exists (#5375) 2018-04-05 16:38:48 +05:30
Achilles Rasquinha
801b5f71ef
Merge pull request #5325 from achillesrasquinha/hf-11760
Fix DropBox path read with os.walk
2018-03-30 16:27:35 +05:30
Achilles Rasquinha
7da1989779 fix dropbox 2018-03-30 16:25:33 +05:30
Nabin Hait
3f3d9e52c8 Fixed merge conflict 2018-03-23 15:16:18 +05:30
Nabin Hait
d0f3b9b6e6
Dropbox settings UX fix (#5253)
* Fixed dropbox UX issue

* Fixed typo
2018-03-23 15:09:28 +05:30
Revant Nandgaonkar
f4a254d0f7 py3-ready encode returns bytes 2018-03-19 23:11:46 +05:30
Saurabh
e2a6a954a5 [fix] validate minimum transaction amount while creating a charge on stripe (#5223) 2018-03-19 18:28:53 +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