Commit graph

3538 commits

Author SHA1 Message Date
PCoder
a3f212a59e Fix PEP8 error 2017-12-24 18:33:24 +01:00
PCoder
a34bd83c5e Refactor reactivate link html 2017-12-24 18:07:30 +01:00
PCoder
ca2a90ca2d On reactivate, take user to pricing page 2017-12-24 18:06:17 +01:00
PCoder
89d70a2b6a Fix bug: rename subscription_id to stripe_subscription_id 2017-12-24 15:04:20 +01:00
PCoder
eb067f5708 Refactor code and log messages for possible errors 2017-12-24 14:38:32 +01:00
PCoder
29c24574aa Cancel subscription on membership deactivation + some more reorganizes + import logger 2017-12-24 14:26:40 +01:00
PCoder
707e1897b3 Reorganize imports 2017-12-24 14:23:33 +01:00
PCoder
63215b1c42 Organize imports 2017-12-24 13:35:53 +01:00
PCoder
b19c3bdcde Reformat code 2017-12-24 13:15:48 +01:00
PCoder
b4421bc9b2 Reformat code 2017-12-24 13:06:23 +01:00
PCoder
f6d0b6ce9c Add stripe_subscription_id to MembershipOrder data 2017-12-24 12:54:59 +01:00
PCoder
3ed6119dc9 Check if DG subscription created was under trial; if not show error 2017-12-24 12:53:23 +01:00
PCoder
f5170cce5f Call DG subscribe_customer_to_plan with trial period until first of next month 2017-12-24 12:51:16 +01:00
PCoder
3826ca207a Reformat code 2017-12-24 12:48:03 +01:00
PCoder
11b8ebe401 Import time 2017-12-24 12:46:36 +01:00
PCoder
0091281357 Add next_month_in_sec_since_epoch MembershipType function 2017-12-24 12:45:59 +01:00
PCoder
6fa8dbb5cb Add trial_end parameter to subscribe_customer_to_plan 2017-12-24 12:32:08 +01:00
PCoder
b2d0fd45ad Fix PEP8 error 2017-12-24 00:21:25 +01:00
PCoder
872582f45f Add tentative code to subscribe customer to Stripe plan (wip) 2017-12-24 00:08:17 +01:00
PCoder
f226c551a8 Add stripe_subscription_id field to MembershipOrder 2017-12-24 00:06:21 +01:00
PCoder
10bc05f700 User customer's name instead of email for cardholder_name if not provided 2017-12-23 23:07:53 +01:00
PCoder
1f85273fd0 Set cardholder_name field for UserBillingAddressForm in digital glarus membership payment post 2017-12-23 22:59:16 +01:00
PCoder
5662cc44c8 Update Changelog 2017-12-23 18:19:10 +01:00
Pcoder
a7bd6560d1
Merge pull request #550 from pcoder/task/3973/change_dcl_contact_info
Update datacenterlight and glasfaser contact address
2017-12-23 18:15:38 +01:00
PCoder
959e624de8 Fix opening for p tag 2017-12-23 18:08:57 +01:00
PCoder
94b1051e85 Update glasfaser contact address too 2017-12-23 18:06:37 +01:00
PCoder
815b5392ac Merge branch 'master' into task/3973/change_dcl_contact_info 2017-12-23 07:38:28 +01:00
PCoder
9df6bd354d Update Changelog 2017-12-23 07:12:07 +01:00
Pcoder
f7f8a1e1d7
Merge pull request #548 from pcoder/task/3601/reduce_min_ram_to_1G
Change minimum required RAM from 2GB to 1GB
2017-12-23 07:07:07 +01:00
PCoder
a753c8d582 Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G 2017-12-23 06:59:31 +01:00
Arvind Tiwari
f013ac3db4
Update Changelog 2017-12-23 05:38:24 +05:30
Arvind Tiwari
41a45f32bb
Merge pull request #551 from tiwariav/bugfix/ungleich_landing
bugfix/punctuation fix
2017-12-23 05:28:50 +05:30
Arvind Tiwari
810a540d08 punctuation fix 2017-12-23 05:22:21 +05:30
PCoder
4870649e93 Update datacenterlight contact address 2017-12-23 00:49:50 +01:00
Arvind Tiwari
6ea012571a
reduce section padding 2017-12-23 04:56:45 +05:30
PCoder
b91260bf26 Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G 2017-12-23 00:16:05 +01:00
Arvind Tiwari
f26f43e391
Merge pull request #549 from tiwariav/bugfix/ungleich_landing
bugfix/text fix for ungleich landing page
2017-12-23 04:44:01 +05:30
PCoder
6c017d1581 Remove commented translation 2017-12-22 23:59:51 +01:00
Arvind Tiwari
4c73dddb6d text fix for landing 2017-12-23 04:29:31 +05:30
PCoder
57c5255708 Update translation in DE : 200 to 2000 2017-12-22 23:37:49 +01:00
PCoder
3a558c86a6 Merge branch 'master' into task/3601/reduce_min_ram_to_1G 2017-12-22 23:27:32 +01:00
PCoder
3e48b936f4 Update Changelog 2017-12-22 23:03:58 +01:00
Pcoder
bbd02687c9
Merge pull request #511 from pcoder/task/3774/update_stripe_subscription_on_vm_delete
Task/3774/update stripe subscription on vm delete
2017-12-22 22:46:02 +01:00
PCoder
485a7e1897 Merge mainRepo/master into task/3601/reduce_min_ram_to_1G 2017-12-22 22:10:08 +01:00
PCoder
a0774ca0d4 Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-22 22:06:38 +01:00
Arvind Tiwari
8fad2ef09d
Merge pull request #542 from tiwariav/task/video_cover
video slider cms plugin
2017-12-23 02:18:31 +05:30
Arvind Tiwari
fc9b901f9a translations added 2017-12-22 01:06:55 +05:30
Arvind Tiwari
48eacef8ef typographical fixes 2017-12-22 00:59:53 +05:30
PCoder
3852ce04de Set default RAM value to 2G in landing and hosting VM calculators 2017-12-21 08:41:29 +01:00
PCoder
979a62f120 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-21 02:04:17 +01:00