PCoder
|
ffae844ee5
|
Merge remote-tracking branch 'mainRepo/master' into 7894/show-one-time-payment-invoices
|
2020-06-19 12:40:52 +05:30 |
|
PCoder
|
bc69cc49e5
|
Move opennebula specific code to celery to make it asynchronous
|
2020-06-11 15:20:42 +05:30 |
|
PCoder
|
7db3dc4222
|
Fix circular imports and correct hosting order link
|
2020-04-15 17:36:40 +05:30 |
|
PCoder
|
f089892c90
|
Remove duplicated html + add href link to order
|
2020-04-10 20:02:12 +05:30 |
|
PCoder
|
4869fd51df
|
Change to filter from simple
|
2020-04-07 18:35:25 +05:30 |
|
PCoder
|
4435eef077
|
Chanage tag to simple
|
2020-04-01 17:26:12 +05:30 |
|
PCoder
|
d0be07ecd5
|
Add custom_tag get_line_item_from_hosting_order_charge
|
2020-04-01 17:07:10 +05:30 |
|
PCoder
|
cb3ff73100
|
Filter out None case for discount's name
|
2020-03-25 18:47:00 +05:30 |
|
PCoder
|
46c33cf107
|
Update price to 11.5 CHF per month in intro emails
|
2020-03-24 12:34:26 +05:30 |
|
PCoder
|
9d96ecefea
|
Remove unwanted import
|
2020-03-18 12:44:18 +05:30 |
|
PCoder
|
580960548e
|
Merge tag '2.10.2' into branch-2.10.3b
Introduce base price for VMs and let admins add stripe_coupon_id
|
2020-03-18 12:05:57 +05:30 |
|
PCoder
|
b44a7f98b5
|
Use username instead of email when creating VM
|
2020-03-05 15:55:44 +05:30 |
|
PCoder
|
e2c86116b2
|
Use username for opennebula related tasks
|
2020-03-05 15:27:18 +05:30 |
|
PCoder
|
dd2eae68e6
|
Use math round to round amount to 2 decimal places
|
2020-02-04 11:20:17 +05:30 |
|
PCoder
|
e322e58246
|
Use appropriate stripe_coupon_id
|
2020-02-04 09:06:10 +05:30 |
|
PCoder
|
3ca1a45217
|
Add stripe_coupon_id to VMPricing
|
2020-02-04 08:57:54 +05:30 |
|
PCoder
|
e6de90e431
|
Set vm base price in js also
|
2020-02-03 12:07:50 +05:30 |
|
PCoder
|
3061c1483c
|
Switch bold between Recurring text and value
|
2020-02-02 22:37:29 +05:30 |
|
PCoder
|
f68549d80d
|
Add DE translations by moep
|
2020-02-02 22:33:13 +05:30 |
|
PCoder
|
b607575c8c
|
Switch bold for description title and description text
|
2020-02-02 22:29:01 +05:30 |
|
PCoder
|
368db61a2f
|
Remove padding left
|
2020-02-02 22:11:26 +05:30 |
|
PCoder
|
359a633047
|
Fix mobile view
|
2020-02-02 22:00:22 +05:30 |
|
PCoder
|
1630dc195b
|
Reduce header font size
|
2020-02-02 21:52:48 +05:30 |
|
PCoder
|
f0f8af2367
|
Change col-sm-8 to col-sm-9 to spread content further on desktop view
|
2020-02-02 21:39:51 +05:30 |
|
PCoder
|
a5d393ad20
|
Right align prices
|
2020-02-02 13:21:01 +05:30 |
|
PCoder
|
70a3620598
|
Fix getting product from plan_name
|
2020-02-02 13:09:27 +05:30 |
|
PCoder
|
42a4a77c02
|
Show product name
|
2020-02-02 12:42:19 +05:30 |
|
PCoder
|
e094930d6e
|
Show product name in invoices list if product is not a VM
|
2020-02-02 12:39:19 +05:30 |
|
PCoder
|
c0683d9f53
|
Show prices to two decimal places
|
2020-02-02 10:57:14 +05:30 |
|
PCoder
|
fc8c4579fb
|
Show prices to two decimals
|
2020-02-02 10:41:51 +05:30 |
|
PCoder
|
9f86f44569
|
Add missing divs
|
2020-02-02 10:29:33 +05:30 |
|
PCoder
|
ffde015c31
|
Fix divs
|
2020-02-02 10:26:13 +05:30 |
|
PCoder
|
c765698a0f
|
Add two columns for pricing
|
2020-02-02 10:16:45 +05:30 |
|
PCoder
|
44dee625b4
|
Add some DE translations
|
2020-02-01 20:24:55 +05:30 |
|
PCoder
|
8fe689d993
|
Update some DE translations
|
2020-02-01 15:23:26 +05:30 |
|
PCoder
|
b103cff0a6
|
Dont round_up discount (is obtained from subtraction)
|
2020-02-01 13:54:29 +05:30 |
|
PCoder
|
c43afb7c59
|
Use round_up method
|
2020-02-01 13:47:29 +05:30 |
|
PCoder
|
23b25002ae
|
Take users to invoice url instead of orders
Orders need a VAT alignment fix
|
2020-02-01 13:00:10 +05:30 |
|
PCoder
|
e6f00abd71
|
Do not round
|
2020-02-01 09:17:24 +05:30 |
|
PCoder
|
838163bd59
|
Make total price consistent
|
2020-02-01 09:15:12 +05:30 |
|
PCoder
|
b1acd3f25b
|
Convert VAT percent to CHF before calculations
|
2020-02-01 09:02:17 +05:30 |
|
PCoder
|
f4393426d3
|
Fix proper VAT values
|
2020-02-01 08:53:24 +05:30 |
|
PCoder
|
7a9b315e2e
|
Add media query for device width less than 368px
|
2020-01-30 12:33:47 +05:30 |
|
PCoder
|
3141dc2793
|
Round price_with_vat
|
2020-01-30 11:52:29 +05:30 |
|
PCoder
|
3d51e4fe32
|
Update alignments
|
2020-01-30 11:39:54 +05:30 |
|
PCoder
|
f546c5cb4f
|
Increase content space in order detail desktop view
|
2020-01-29 17:38:44 +05:30 |
|
PCoder
|
4128aeb64d
|
Add line height for final price
|
2020-01-29 17:21:59 +05:30 |
|
PCoder
|
ad606c2c55
|
Correct calculation of total price
|
2020-01-29 16:50:05 +05:30 |
|
PCoder
|
6132638faa
|
Use correct vat
|
2020-01-29 16:32:07 +05:30 |
|
PCoder
|
b8eca59e0d
|
Fix design for showing prices excl and incl vat and discount
|
2020-01-29 16:04:03 +05:30 |
|
PCoder
|
970834cc38
|
Add parameters needed for displaying prices after discount, and vat
|
2020-01-29 16:03:13 +05:30 |
|
PCoder
|
cde6c51d4b
|
Reset vat_validation_status when on payment page
|
2020-01-26 10:06:31 +05:30 |
|
PCoder
|
d1fd57b730
|
Correct the way we get amount from discount
|
2020-01-24 15:26:41 +05:30 |
|
PCoder
|
156930ab26
|
Add price_after_discount explicitly for showing in template
|
2020-01-24 15:24:46 +05:30 |
|
PCoder
|
38550ea75c
|
Rearrange the way we show VAT and discount calculations
|
2020-01-24 15:00:16 +05:30 |
|
PCoder
|
e01b27835e
|
Make subscription exclusive of VAT + Add VAT separately to subscription
|
2020-01-24 14:11:55 +05:30 |
|
PCoder
|
a00a9f6ff0
|
Show invoices directly from stripe
|
2020-01-20 12:07:32 +05:30 |
|
PCoder
|
9212c02cd7
|
Check vat_validation_status exists in dict before using it
|
2020-01-10 19:47:49 +05:30 |
|
PCoder
|
ed1a4fc1a6
|
Merge remote-tracking branch 'mainRepo/master' into feature/VAT_number
|
2020-01-01 00:21:35 +05:30 |
|
PCoder
|
0bca5113ca
|
Fix unwanted char
|
2020-01-01 00:10:56 +05:30 |
|
PCoder
|
7423a80670
|
Use correct variable
|
2019-12-31 22:50:46 +05:30 |
|
PCoder
|
ca5724f10f
|
Fix error message
|
2019-12-31 18:36:38 +05:30 |
|
PCoder
|
2378410f2d
|
Compare country for creating new tax id
|
2019-12-31 18:22:57 +05:30 |
|
PCoder
|
9078e46196
|
Add log
|
2019-12-31 18:08:09 +05:30 |
|
PCoder
|
3ca7e89f4f
|
Show VAT for eu countries only
|
2019-12-31 17:28:11 +05:30 |
|
PCoder
|
b567b01362
|
For CH we don't care whether VAT is validated or not
|
2019-12-26 20:51:11 +05:30 |
|
PCoder
|
12975565a5
|
More bugfix
|
2019-12-26 20:09:28 +05:30 |
|
PCoder
|
d62986c91f
|
Bugfix: use correct total price after discount
|
2019-12-26 20:05:55 +05:30 |
|
PCoder
|
fcdabd8dc3
|
Set vat validation status in more places
|
2019-12-26 19:55:28 +05:30 |
|
PCoder
|
a5c7865811
|
Save validation status
|
2019-12-26 19:37:57 +05:30 |
|
PCoder
|
7eed04ec73
|
Remove one log too many
|
2019-12-26 19:16:26 +05:30 |
|
PCoder
|
cbf2f05d70
|
Use the latest billing address as the default one
|
2019-12-26 18:54:17 +05:30 |
|
PCoder
|
c6147c887c
|
More logging + improve ba string repr
|
2019-12-26 18:34:26 +05:30 |
|
PCoder
|
064ea5be2f
|
More logging
|
2019-12-26 18:26:30 +05:30 |
|
PCoder
|
32d9f06c18
|
Add logger messages
|
2019-12-26 18:22:08 +05:30 |
|
PCoder
|
6d0a7f7049
|
Improve stripe_customer_id
|
2019-12-26 18:06:22 +05:30 |
|
PCoder
|
ad52338653
|
Save billing addresses
|
2019-12-26 14:27:16 +05:30 |
|
PCoder
|
d8c03a4364
|
Add missing param
|
2019-12-26 14:21:18 +05:30 |
|
PCoder
|
9aff248d31
|
Use correct billingaddress
|
2019-12-26 14:19:07 +05:30 |
|
PCoder
|
99e70d95c4
|
VAT number validation in settings
|
2019-12-26 13:31:15 +05:30 |
|
PCoder
|
7d9ab322c9
|
Remove vat_validate_on session var
|
2019-12-26 12:38:00 +05:30 |
|
PCoder
|
242dbb2479
|
Bugfix: pass param
|
2019-12-26 11:50:15 +05:30 |
|
PCoder
|
9310f72cf9
|
Save tax id in billing address even if no StripeCustomer
|
2019-12-26 11:30:01 +05:30 |
|
PCoder
|
74d1bbb6d3
|
Add missing customer save call
|
2019-12-26 11:09:14 +05:30 |
|
PCoder
|
6fd0659c88
|
Another missing param
|
2019-12-26 11:02:58 +05:30 |
|
PCoder
|
4560c8bf83
|
Bugfix: Pass parameter name
|
2019-12-26 11:00:24 +05:30 |
|
PCoder
|
0e40ca6044
|
Also validate vat in order confirmation get
|
2019-12-26 10:55:01 +05:30 |
|
PCoder
|
c393902396
|
Save address form in payment post itself
|
2019-12-26 10:54:26 +05:30 |
|
PCoder
|
825e716625
|
Update tax_id fields of billing_addresses which belong to supplied user only
|
2019-12-26 10:51:50 +05:30 |
|
PCoder
|
0d208d2bd9
|
Take billing_address_id in validate_vat_number
|
2019-12-26 10:50:53 +05:30 |
|
PCoder
|
52201c0aa1
|
Clear billing_address_id session var also
|
2019-12-26 10:49:45 +05:30 |
|
PCoder
|
0b8315ca76
|
Remove wrong filter
|
2019-12-25 23:20:48 +05:30 |
|
PCoder
|
4a40438edc
|
Also handle ch_vat
|
2019-12-25 23:10:18 +05:30 |
|
PCoder
|
908c2e055c
|
Also clear vat_validation_status from session
|
2019-12-25 22:48:57 +05:30 |
|
PCoder
|
4491a52bd9
|
Check if vat_validation_status is in session
|
2019-12-25 22:45:55 +05:30 |
|
PCoder
|
b15ece7088
|
Validate VAT number only if it is set
|
2019-12-25 22:40:57 +05:30 |
|
PCoder
|
3b654f1c49
|
Correct++
|
2019-12-25 22:35:41 +05:30 |
|
PCoder
|
752b61a852
|
Correct the way to get the first object
|
2019-12-25 22:33:56 +05:30 |
|
PCoder
|
110459b38d
|
Show vat error in payment page
|
2019-12-25 22:27:14 +05:30 |
|
PCoder
|
de0fe77779
|
Bugfix: pass correct param
|
2019-12-25 22:22:08 +05:30 |
|
PCoder
|
785f99311d
|
Handle invalid VAT number case
|
2019-12-25 21:02:43 +05:30 |
|
PCoder
|
1b243822a9
|
Bugfix: remove unnecessary self param
|
2019-12-25 20:20:43 +05:30 |
|
PCoder
|
1400d27afa
|
Handle tax_id creation
|
2019-12-25 20:11:15 +05:30 |
|
PCoder
|
8ebd12c420
|
Add missing vat_number while saving billing address
|
2019-12-25 10:32:37 +05:30 |
|
PCoder
|
6eb4b03afe
|
Merge remote-tracking branch 'origin/master' into feature/VAT_number
|
2019-12-25 08:15:22 +05:30 |
|
PCoder
|
31905695c9
|
Add vertical spacing for mobile style
|
2019-12-24 19:00:17 +05:30 |
|
PCoder
|
7b7f8fb191
|
Set the calculator's post action url explicitly
|
2019-12-24 17:57:24 +05:30 |
|
PCoder
|
3b7183fc63
|
Set js in correct file
|
2019-12-24 10:49:12 +05:30 |
|
PCoder
|
3a0fe87a8e
|
Use correct comparison format
|
2019-12-24 10:42:47 +05:30 |
|
PCoder
|
f1821954eb
|
Set js for non transparent navbar always
|
2019-12-24 10:37:24 +05:30 |
|
PCoder
|
3b6e5d448b
|
Add show non transparent navbar always option
|
2019-12-24 09:06:17 +05:30 |
|
PCoder
|
b919b6cfbd
|
Fix wrong indentation
|
2019-12-21 08:51:11 +05:30 |
|
PCoder
|
f566aa8a2e
|
Make VAT number a part of billing address
|
2019-12-21 08:43:34 +05:30 |
|
PCoder
|
c9de757bc7
|
Merge remote-tracking branch 'mainRepo/master' into feature/VAT_number
|
2019-12-21 08:19:23 +05:30 |
|
PCoder
|
ed74504270
|
Bugfix: Swiss VAT wrongly being applied to non EU customers
|
2019-12-18 19:33:44 +05:30 |
|
PCoder
|
24edf05e7a
|
Save vat_number after payment is submitted
|
2019-12-17 23:57:15 +05:30 |
|
PCoder
|
6ea486b527
|
Initialize vat number in payment forms
|
2019-12-17 23:48:05 +05:30 |
|
PCoder
|
5e97d70a5e
|
Save VAT number
|
2019-12-17 22:52:22 +05:30 |
|
PCoder
|
0f3acf5db4
|
Change order_detail and invoice_detail templates to show VAT number
|
2019-12-17 22:51:54 +05:30 |
|
PCoder
|
6666e40ec4
|
Remove unused imports
|
2019-12-14 11:00:37 +05:30 |
|
PCoder
|
7442cbd9ca
|
Print appropriate message
|
2019-12-14 10:56:14 +05:30 |
|
PCoder
|
991908c37e
|
Fix obtianing active customers only
|
2019-12-14 10:52:20 +05:30 |
|
PCoder
|
70f0fed63f
|
Add all_customers management command
|
2019-12-14 10:18:39 +05:30 |
|
PCoder
|
744e76c5df
|
Change price
15 CHF -> 10.5 CHF
|
2019-12-09 17:47:47 +05:30 |
|
PCoder
|
d8172d6bb2
|
Fix vat_country
|
2019-12-07 19:42:46 +05:30 |
|
PCoder
|
3b0e479a70
|
Use country specific vats for dcl vm buy flow
|
2019-12-07 19:26:21 +05:30 |
|
PCoder
|
67d38df047
|
Correction by Sanghee: Benusername -> Benutzername
|
2019-11-16 20:41:24 +05:30 |
|
_moep_
|
f82ed81b33
|
add german translation
|
2019-11-16 08:30:44 +01:00 |
|
PCoder
|
1ff577ddcd
|
Update django.po
|
2019-11-15 23:06:29 +05:30 |
|
PCoder
|
15ef20dbc1
|
Fix yearly email
|
2019-11-15 22:58:47 +05:30 |
|
PCoder
|
93527fdc02
|
Update datacenterlight's django.po
|
2019-11-15 20:22:14 +05:30 |
|
PCoder
|
b790676940
|
Update datacenterlight's django.po
|
2019-11-15 20:07:26 +05:30 |
|
PCoder
|
435cfa46a6
|
Change interval to year for that case in order confirmation
|
2019-11-15 19:57:53 +05:30 |
|
PCoder
|
e493a9f3d1
|
Allow creating yearly/monthly Stripe plans
|
2019-11-15 19:47:11 +05:30 |
|
PCoder
|
3599f0bff4
|
Show VAT elegantly
|
2019-11-15 13:11:11 +05:30 |
|
PCoder
|
76c2b9d16c
|
Fix bug: change arg name
|
2019-11-15 12:23:44 +05:30 |
|
PCoder
|
44a20a5029
|
Apply country specific VAT rates for Generic Products
|
2019-11-15 11:58:15 +05:30 |
|
PCoder
|
270a03e7c5
|
Improve deleteuser
Do not delete order, bill and vm_detail
|
2019-11-04 17:09:40 +05:30 |
|
PCoder
|
4174c6226f
|
Remove pprint (does not seem to help)
|
2019-11-04 12:19:25 +05:30 |
|
PCoder
|
7aec4dd938
|
Convert dict to json and then dump + fix checking None on FileField
|
2019-11-04 12:15:57 +05:30 |
|
PCoder
|
6faa8b82e8
|
Remove unwanted logger/print statements
|
2019-11-04 12:10:22 +05:30 |
|
PCoder
|
72741f2188
|
Fix bugs
- Use correct attribute created_at instead of created_on
- Convert yet another date to str (missed earlier)
|
2019-11-04 11:59:48 +05:30 |
|
|
b06c4d541f
|
Feature/add userdump
|
2019-11-04 07:16:59 +01:00 |
|
PCoder
|
b6ec2ac95b
|
Add missing cc expiry year month in payment page
|
2019-07-09 19:08:19 +05:30 |
|
PCoder
|
903ef48c75
|
Format cc month to 2 decimal places
|
2019-07-09 19:03:09 +05:30 |
|
PCoder
|
59c45492a9
|
Add expiry year and month in the settings and order payment pages
|
2019-07-09 18:40:41 +05:30 |
|
PCoder
|
d3e2074b16
|
Update DE translation
Your VM is almost ready! => Deine VM ist fast fertig!
|
2019-07-03 17:29:42 +05:30 |
|
PCoder
|
2a4fb8c8de
|
Add DE translation
Your VM is almost ready! => Ihre VM ist fast fertig!
|
2019-07-03 16:57:00 +05:30 |
|
PCoder
|
69401a1cc6
|
Make messages for datacenterlight and add some DE translations
|
2019-07-03 16:52:08 +05:30 |
|
PCoder
|
b0548f4cfa
|
Translate ssh key form title and subtitles
|
2019-07-03 16:51:29 +05:30 |
|