Ivan Hörler
a18765b0a6
add orders RESTfull
2018-02-27 23:56:41 +01:00
Ivan Hörler
f170f5b0da
add checkout cancel button
2018-02-27 22:16:24 +01:00
Ivan Hörler
9354817dd7
fix excepton if user has no orders.
2018-02-27 22:11:02 +01:00
Ivan Hörler
f6ae6cf872
add profile oders in tableform with
2018-02-27 22:01:39 +01:00
Ivan Hörler
c74438904c
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
change some code
correct the html templates
remove todo tags
resize the mockup picture so it doesn't use a whole page
add a page break to move the interface section to it's own page
add captions and centering to the tikz figures
make the swot table a bit smaller
update readme
2018-02-27 20:46:18 +01:00
Ivan Hörler
a8a27c6b75
add profile view of orders
2018-02-27 20:46:05 +01:00
Andreas Zweili
45d15919cf
change some code
2018-02-27 18:40:05 +01:00
Andreas Zweili
208d7d51df
correct the html templates
2018-02-27 18:21:34 +01:00
Ivan Hörler
d38a37536a
fix delete cartitems after purchase
2018-02-27 07:22:57 +01:00
Andreas Zweili
a1e74a32c2
readd the order url
...
somehow this got lost
2018-02-26 22:51:43 +01:00
Andreas Zweili
91d6b2b4d4
fix the cart deletion
2018-02-26 22:44:47 +01:00
Andreas Zweili
ee4d332a3b
fix the OrderPosition creation
2018-02-26 22:44:36 +01:00
Andreas Zweili
ba61ed12a6
move the post block below the cart operation
2018-02-26 22:33:29 +01:00
Andreas Zweili
29689fd16a
set the exchange_rate variable to False initially
...
Since we start with CHF by default the exchange_rate variable should
be False
2018-02-26 22:32:46 +01:00
Andreas Zweili
3073baf43f
remove the person variable
2018-02-26 22:32:21 +01:00
Andreas Zweili
9b0fc0ba06
allow the ExchangeRate to be null
...
If we buy the article in CHF there is no ExchangeRate object
2018-02-26 22:31:37 +01:00
Andreas Zweili
b9d2d9f6ae
only query the exchange_rate if the currency was set
2018-02-26 22:24:01 +01:00
Andreas Zweili
865ff557bd
add some empty lines for readability
2018-02-26 22:23:29 +01:00
Andreas Zweili
a232ca414c
move the person up
2018-02-26 22:23:15 +01:00
Andreas Zweili
6c172405ca
add the orderposition modell
2018-02-26 22:22:45 +01:00
Andreas Zweili
45571b8ea9
use CHF as the default currency_name
2018-02-26 22:22:22 +01:00
Andreas Zweili
d51e9dfa08
shorten the order view
2018-02-26 21:56:07 +01:00
Andreas Zweili
db737eca02
only get the cart
...
the cart was created in the cart view. In the checkout we only want to
display it.
2018-02-26 21:55:38 +01:00
Andreas Zweili
494ce66631
only execute the currency part if it exists in the session
2018-02-26 21:55:15 +01:00
Andreas Zweili
f62a6a91d9
only create the order
2018-02-26 21:54:40 +01:00
Andreas Zweili
3970555cf1
shorten the line a bit
2018-02-26 21:54:11 +01:00
Andreas Zweili
691fdc12f5
display the position amount correctly
2018-02-26 21:53:21 +01:00
Andreas Zweili
ac7ae505e3
remove old code
2018-02-26 21:53:13 +01:00
Ivan Hörler
a389e64149
fix order save to db
2018-02-26 21:22:07 +01:00
Andreas Zweili
1274f76b71
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-26 21:02:13 +01:00
Andreas Zweili
1be2249957
users must login to view their cart and to checkout
2018-02-26 21:01:55 +01:00
Ivan Hörler
736c5d4ba3
fix url for order
2018-02-26 20:56:18 +01:00
Ivan Hörler
ffcf6e6ba5
change orders to order and delete unused
2018-02-26 20:49:49 +01:00
Ivan Hörler
037df6b9bc
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
fix the currency calculation in the cart
add some empty lines for better readability
2018-02-26 19:58:13 +01:00
Ivan Hörler
6c46d0a6ce
add order
2018-02-26 19:56:45 +01:00
Andreas Zweili
66a066165d
fix the currency calculation in the cart
2018-02-25 21:33:53 +01:00
Andreas Zweili
798cee4c58
add some empty lines for better readability
2018-02-25 21:33:34 +01:00
Andreas Zweili
b15745a3bc
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-25 19:59:23 +01:00
Andreas Zweili
efa92ea074
correct the currency calculation
2018-02-25 19:58:30 +01:00
Andreas Zweili
c5b118c7c2
correct the cart creation
2018-02-25 19:57:50 +01:00
Ivan Hörler
2c52c2483a
improved the table styleing
2018-02-25 19:26:26 +01:00
Andreas Zweili
e4a58c48fd
shorten a line to under 80 characters
2018-02-25 17:30:20 +01:00
Andreas Zweili
81f0fc0c4b
fix the currency calculation in the cart
2018-02-25 17:26:43 +01:00
Andreas Zweili
1c52e938c3
change the checkout url
2018-02-25 17:26:24 +01:00
Andreas Zweili
7da09d736c
add a line to comply with PEP8
2018-02-25 14:23:18 +01:00
Andreas Zweili
0d943106a0
correct queries which use the user object
2018-02-25 14:22:50 +01:00
Andreas Zweili
6e54bdec0d
fix comment indents
2018-02-25 14:22:22 +01:00
Andreas Zweili
597dd70ba7
change the template in the checkout view
2018-02-25 14:21:32 +01:00
Andreas Zweili
f36550e9d4
add a user object to the checkout view
2018-02-25 14:20:59 +01:00
Ivan Hörler
5b1530c0bd
add checkout template, view and function
2018-02-25 13:12:13 +01:00