Commit Graph

301 Commits

Author SHA1 Message Date
PCoder f2f1c61739 Remove margin from a tags for explanation text 2017-12-27 23:59:40 +01:00
PCoder 2c6204de9b Merge branch 'task/3994/dg_add_signup_clarification_line' of https://github.com/pcoder/dynamicweb into task/3994/dg_add_signup_clarification_line 2017-12-27 21:18:43 +01:00
PCoder a743e4e8a0 Merge branch 'master' into task/3994/dg_add_signup_clarification_line 2017-12-27 21:18:13 +01:00
PCoder 0abd165c8e Skip test_post if Stripe API key is not provided 2017-12-27 20:21:37 +01:00
PCoder 3189568884 Send emails to admin when Stripe transaction error 2017-12-27 20:04:29 +01:00
M.Ravi 251b5d7495 Remove a whitespace 2017-12-27 11:03:12 +01:00
PCoder 3489640afe Add DG signup clarification line 2017-12-24 21:17:52 +01:00
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 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
Arvind Tiwari 6515195af5 digitalglarus logo alignment fix 2017-12-09 05:19:07 +05:30
Arvind Tiwari ed873ca59f
Merge pull request #532 from tiwariav/task/3594/digitalglarus_responsive_scrollbar_fix
task/3594 digitalglarus landing page fix
2017-12-05 17:28:26 +05:30
Arvind Tiwari 1d3307043e mobile text size and alignment fix 2017-11-29 01:30:50 +05:30
Arvind Tiwari 2d05720016 merged master 2017-11-27 16:30:42 +05:30
PCoder 273fa75d55 Fix PEP8 warnings 2017-11-26 01:12:16 +01:00
PCoder 1dc5bb9bc8 Use /cms in digitalglarus.test_views.ViewsTest 2017-11-25 19:12:08 +01:00
Arvind Tiwari e0f2fb2f1f digitalglarus history html fix 2017-11-25 23:37:02 +05:30
Arvind Tiwari 9156e35f97 Merge branch 'master' into task/3594/digitalglarus_responsive_scrollbar_fix 2017-11-25 23:09:34 +05:30
PCoder 01aadefd6c Comment code that fails assertion 2017-11-25 12:39:56 +01:00
Arvind Tiwari 38c0c653df image set to background of each slide instead of a common background 2017-11-25 02:34:26 +05:30
Arvind Tiwari 994f193276 html fix 2017-11-06 00:26:39 +05:30
Arvind Tiwari 19f91773e3 contact map working 2017-11-05 14:25:17 +05:30
Arvind Tiwari fbf2fdd78b impact hub logo container alignment fix 2017-11-02 23:57:54 +05:30
Arvind Tiwari fcc22945a4 digitalglarus landing page animation direction changed, bootstrap grid fix 2017-11-02 23:49:38 +05:30
Arvind Tiwari 452089e103 translation fix 2017-10-10 21:38:49 +05:30
Andrii Marynets 3fc1cd9463 Fix url which will be deprecated in Django 1.10 2017-07-19 00:39:52 +03:00
M.Ravi 04fe427571 Added link to impact hub logo 2017-07-18 19:47:45 +02:00
Pcoder 7dcf335c3a Merge pull request #402 from pcoder/task/3590/impact_hub_partner_logo_text
Added impacthub partner text and logo. Adjusted the layout for various screens.
2017-07-17 23:52:43 +02:00
PCoder a2631a9e8d Added impacthub partner text and logo. Adjusted the layout for various screens. 2017-07-18 03:03:36 +05:30
PCoder a570f9963f Generated .po for digitalglarus 2017-07-16 23:26:07 +05:30
Andrii Marynets c7feed6a73 Delete commented code 2017-07-13 23:50:11 +03:00
Andrii Marynets a8be59d7a2 Add GA to all important apps 2017-07-13 22:53:15 +03:00