Andrii Marynets
1f658a425f
Merge with master
2017-07-02 17:56:49 +03:00
Andrii Marynets
303d99d70d
Merge branch 'master' into feature/add_google_analytics
...
# Conflicts:
# datacenterlight/templates/datacenterlight/order_detail.html
2017-07-02 17:56:07 +03:00
M.Ravi
871237d84f
Updated Changelog for the release 1.0.18
2017-07-02 15:33:11 +02:00
Pcoder
c8d0a2e91f
Merge pull request #364 from pcoder/master
...
Fixed hosting template footer for unauthenticated case
2017-07-01 14:44:24 +02:00
PCoder
f847302acd
Fixed hosting template footer for unauthenticated case (direct payment + order confirmation)
2017-07-01 11:22:12 +05:30
Pcoder
d8786c9a3c
Merge pull request #363 from pcoder/new_flow_enhancement
...
Fixed logo in payment/order confirmation page not redirecting to inde…
2017-07-01 01:16:11 +02:00
PCoder
b502cb5da8
Fixed logo in payment/order confirmation page not redirecting to index issue
2017-07-01 04:29:11 +05:30
Pcoder
3aa1357960
Merge pull request #362 from pcoder/new_flow_enhancement
...
- DE translations added
- Missing OS configuration added to payment and order confirmation pages
- Autofill of billing address when pressing back button on order confirmation page
2017-07-01 00:32:36 +02:00
PCoder
4857bc2cd8
Now fetching billing address data from session variable
2017-07-01 03:54:08 +05:30
PCoder
bd766e2073
Fixed filling up of users details while going back to payment page from order confirmation page
2017-07-01 03:11:16 +05:30
PCoder
285ce2e710
Added OS configuration to the Order Confirmation page
2017-07-01 02:16:24 +05:30
PCoder
e286fc8aaf
Added OS configuration to the payment page
2017-07-01 02:10:30 +05:30
PCoder
0b0892a299
Added OS to the payment page
2017-07-01 01:59:24 +05:30
PCoder
dfd910465c
Added dcl translations used in new flow
2017-07-01 01:40:17 +05:30
Pcoder
0ad3e0d7c7
Merge pull request #361 from pcoder/new_flow_enhancement
...
New flow enhancement
2017-06-30 19:13:37 +02:00
PCoder
160df7685c
Refactored dcl text and support email
2017-06-30 12:47:04 +05:30
PCoder
699326dc57
Made to return empty string for the template filter get_value_from_dict instead of None
2017-06-30 12:33:28 +05:30
PCoder
2350247cdb
Removed unused code
2017-06-30 12:27:18 +05:30
PCoder
1deeec4c33
Added the locale time code to new flow order detail
2017-06-30 12:18:31 +05:30
PCoder
aa561a6cb3
Merge branch 'master' into new_flow_enhancement
2017-06-30 12:14:45 +05:30
PCoder
3eca55a32a
Fixed billing address bug. Fixed back button issues in the new flow
2017-06-30 12:08:07 +05:30
PCoder
d32d2a8976
Added a form in order confirmation page
2017-06-30 12:06:41 +05:30
Andrii Marynets
9431e9846c
Add middleware for fix "get_host() method fails when the host is behind multiple proxies"
2017-06-30 08:44:39 +03:00
PCoder
d161a285b8
Added get_card_details function to stripe_utils
2017-06-30 11:08:00 +05:30
PCoder
4c3d8627b1
Added code to fetch cc data and put in context
2017-06-30 11:06:58 +05:30
PCoder
d0376f35f8
Now getting info in Order Confirmation from session and context
2017-06-30 11:05:34 +05:30
Andrii Marynets
5b53daa14a
Merge branch 'master' into feature/add_google_analytics
2017-06-30 01:43:06 +03:00
Andrii Marynets
ebf8b0646d
Fix not add analytics if DEBUG=True
2017-06-30 01:33:12 +03:00
Andrii Marynets
2ad984504c
Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID
2017-06-30 01:23:35 +03:00
Pcoder
381ac1fea0
Merge pull request #352 from levivm/feature/added_localtime
...
Feature/added localtime
The time shows up fine on the VM order confirmation and the ssh keys page both on chrome and firefox.
2017-06-29 21:27:11 +02:00
Pcoder
69fde64149
Added missing colon
2017-06-29 21:24:52 +02:00
Pcoder
b649bcd87e
Fixed a typo
2017-06-29 21:24:04 +02:00
PCoder
cb6aeae1ae
Refactored the logic to OrderConfirmationView from the PaymentOrderView
2017-06-29 13:08:24 +05:30
PCoder
a2153777e4
We do not have order created when in Order Confirmation page. So removed the id parameter in url
2017-06-29 13:06:05 +05:30
PCoder
3313dab485
Added get_value_from_dict filter to obtain values from a dict in templates
2017-06-29 13:05:06 +05:30
PCoder
a3c3a5cd2e
Changed the way we get info in dcl order_detail template
2017-06-29 13:04:13 +05:30
Andrii Marynets
007fc794c3
Add google analytics to data center light
2017-06-27 23:47:30 +03:00
Levi Velázquez
8904a14961
Merge branch 'master' into feature/added_localtime
2017-06-23 00:31:23 -05:00
Levi
720270bac5
fixed firefox issue
2017-06-23 00:30:31 -05:00
M.Ravi
ed9e5c591c
Merge branch 'pcoder-new_flow'
2017-06-23 04:54:15 +05:30
M.Ravi
796fbbe1f8
Removed status from the order page
2017-06-23 04:38:10 +05:30
M.Ravi
aca831adac
Resolved conflicts while merging pcoder-new_flow
2017-06-23 04:35:33 +05:30
Pcoder
8408e3e7ac
Merge pull request #350 from pcoder/task/3379/text_style_activation
...
Task/3379/text style activation and moep's and sanghee's de translations added
2017-06-22 23:13:58 +02:00
M.Ravi
654d73e51d
Add some de translations and invoice now called 'Confirm Order'
2017-06-23 02:33:59 +05:30
M.Ravi
82e8c377af
Added membership django.po
2017-06-23 02:14:54 +05:30
M.Ravi
165dfa49ab
Fixed __proxy__ to string conversion issue
2017-06-23 01:42:37 +05:30
M.Ravi
3ca7153414
Changed invoice text
2017-06-23 01:34:31 +05:30
M.Ravi
82ebafa5f5
Merge branch 'moeps_translation_fixes' into task/3379/text_style_activation
2017-06-23 01:16:07 +05:30
M.Ravi
9aba565ec0
Added + corrected de translations
2017-06-23 01:15:48 +05:30
M.Ravi
5b8a26eeb3
Fixed a blunder mistake. Was using name instead of email
2017-06-23 00:31:08 +05:30
