Pcoder
|
e557a777c3
|
Merge pull request #666 from pcoder/task/5690/generic-payment-page
Task/5690/generic payment page
|
2018-10-05 09:16:08 +02:00 |
|
PCoder
|
f4579595c3
|
Add newline character to end of file
|
2018-10-05 09:05:47 +02:00 |
|
PCoder
|
12eabc5f6c
|
Redirect user to product page on login
For the case when user is on product page and tries logging in
|
2018-10-05 08:58:57 +02:00 |
|
PCoder
|
e3ec67d32c
|
ProductPaymentForm: Set input fields input-no-border style
|
2018-10-05 08:58:10 +02:00 |
|
PCoder
|
8758cd1cd8
|
Add style input-no-border
|
2018-10-05 08:57:20 +02:00 |
|
PCoder
|
1100d61b5d
|
Fix flake8 warnings
|
2018-10-03 23:17:25 +02:00 |
|
PCoder
|
b3e3af1c1a
|
Make ProductPaymentForm's recurring field hidden
|
2018-10-03 22:54:45 +02:00 |
|
PCoder
|
ec70cd1c83
|
Pass product_id to ProductPaymentForm
|
2018-10-03 22:53:24 +02:00 |
|
PCoder
|
74ec39498e
|
Update GenericProduct
Remove url field
Make slug mandatory
|
2018-10-03 09:58:49 +02:00 |
|
PCoder
|
e4bfdec0b6
|
Update ProductPaymentForm's validation
|
2018-10-03 09:38:49 +02:00 |
|
PCoder
|
193b87bbb5
|
Use proper payment form
|
2018-10-03 09:36:43 +02:00 |
|
PCoder
|
ca18004819
|
Remove stale reference to product_id
|
2018-10-03 09:36:00 +02:00 |
|
PCoder
|
e1c91d886b
|
Use explicit index in plan name formatting
|
2018-10-03 09:35:20 +02:00 |
|
PCoder
|
27a92780a6
|
Add amount label + Reset textarea height
|
2018-10-03 08:38:20 +02:00 |
|
PCoder
|
8a2734fa0e
|
Show GenericPaymentForm labels
|
2018-10-03 08:36:21 +02:00 |
|
PCoder
|
97693f0bb3
|
Format code
|
2018-10-03 08:27:22 +02:00 |
|
PCoder
|
495ac0c6d6
|
Use ProductPaymentForm instead of GenericPaymentForm
Only if product_id is in the session, which identifies that we are
coming here via product_slug
|
2018-10-03 08:19:33 +02:00 |
|
PCoder
|
530bbcd5f6
|
Create ProductPaymentForm from GenericPaymentForm
|
2018-10-03 08:18:45 +02:00 |
|
PCoder
|
1cdc9ea657
|
Clear product_id from session
|
2018-10-03 08:18:19 +02:00 |
|
PCoder
|
a4065c7e24
|
Handle product_slug
|
2018-10-03 07:55:56 +02:00 |
|
PCoder
|
e3bd963600
|
Test product_slug url (wip)
|
2018-10-02 10:02:44 +02:00 |
|
PCoder
|
e47f4f05b4
|
Handler if product_slug is given (wip)
|
2018-10-02 10:02:02 +02:00 |
|
PCoder
|
3bad37c605
|
Make GenericProduct slug unique
|
2018-10-02 10:00:59 +02:00 |
|
PCoder
|
930333357e
|
GenericProduct: Remove image field and add slug field
|
2018-10-02 09:27:38 +02:00 |
|
PCoder
|
dd9e7dde35
|
Merge branch 'master' into task/5690/generic-payment-page
|
2018-10-02 09:01:46 +02:00 |
|
PCoder
|
8743853a7b
|
Update Changelog
|
2018-09-28 08:13:37 +02:00 |
|
PCoder
|
737d890a7c
|
Update Changelog for 2.2.2
|
2018-09-28 08:11:36 +02:00 |
|
Pcoder
|
32767fed68
|
Merge pull request #668 from pcoder/task/5721/set_calculator_OS_order
Task/5721/set calculator OS order
|
2018-09-28 07:32:55 +02:00 |
|
PCoder
|
b047ccdef1
|
Fix flake8 error
|
2018-09-27 22:33:24 +02:00 |
|
PCoder
|
56460ac8f0
|
Update migration
|
2018-09-27 22:16:05 +02:00 |
|
PCoder
|
d93861ca32
|
Set Devuan Ascii as default template
|
2018-09-27 22:14:42 +02:00 |
|
PCoder
|
a02c3c6973
|
Sort templates alphabetically
And also select the chosen template as the default one
|
2018-09-27 22:12:13 +02:00 |
|
PCoder
|
768f3532f7
|
Add default_selected_template field to DCLCalculatorPluginModel
|
2018-09-27 22:09:11 +02:00 |
|
PCoder
|
3075cffd77
|
Include product_id in generic payment Stripe plan name
|
2018-09-26 23:01:04 +02:00 |
|
PCoder
|
232022aaaf
|
Fix flake8 errors
|
2018-09-26 22:51:34 +02:00 |
|
PCoder
|
b7929a16e2
|
Update datacenterlight django.po
|
2018-09-26 22:45:09 +02:00 |
|
PCoder
|
6c03e3f712
|
Change generic payment subject and correct misplaced comma
Data Center LightConfirmation of your payment ->
Confirmation of your payment
|
2018-09-26 22:42:33 +02:00 |
|
PCoder
|
72c16713a7
|
Update .po of datacenterlight
|
2018-09-26 22:37:32 +02:00 |
|
PCoder
|
52d048a555
|
Add missing Cheers string in email
|
2018-09-26 22:35:11 +02:00 |
|
PCoder
|
3148dbccf8
|
Translate text + reformat
|
2018-09-26 22:31:06 +02:00 |
|
PCoder
|
84056a5b36
|
Correct generic payment email as per Sanghee's corrections
|
2018-09-26 22:21:59 +02:00 |
|
PCoder
|
fcc113e9d9
|
Add locale_date class to date fields so that we can localize
|
2018-09-26 22:06:14 +02:00 |
|
PCoder
|
1041284866
|
Refactor moment.js locale date code to virutal_machine_detail.js
|
2018-09-26 21:52:12 +02:00 |
|
PCoder
|
737681136f
|
Correct flake8 error
|
2018-09-26 21:23:46 +02:00 |
|
PCoder
|
efae2b1d9a
|
Update Changelog
|
2018-09-26 21:17:35 +02:00 |
|
Pcoder
|
31e8467f20
|
Merge pull request #667 from pcoder/bugfix/corrections_by_malcolm
Bugfix/corrections by malcolm
- virutal -> virtual
- some DE corrections
|
2018-09-26 21:11:13 +02:00 |
|
PCoder
|
4feeec23d4
|
Correct spelling: virutal -> virtual
|
2018-09-26 20:50:19 +02:00 |
|
PCoder
|
ca578ecf56
|
Merge branch 'master' of https://github.com/MalcolmA/dynamicweb into MalcolmA-master
|
2018-09-26 20:46:54 +02:00 |
|
PCoder
|
b021a8ed6e
|
Remove filer dependency in migration
|
2018-09-26 09:29:10 +02:00 |
|
PCoder
|
99b11f013f
|
Remove old migration
|
2018-09-26 09:25:03 +02:00 |
|