39ae452ee4
Added some Currencies stuff and a Architecture pic.
2018-03-09 11:06:10 +01:00
61124c7000
correct the order view
2018-03-02 16:19:58 +01:00
683fdc08a6
Revert "correct the order view"
...
This reverts commit 7e8ac5077e
2018-03-02 16:18:17 +01:00
92d4e0dd71
Merge branch 'master' of git.2li.ch:ibz/web_AI-5
2018-03-02 16:08:23 +01:00
f7e8b9cd85
show exchangerate in checkout
2018-03-02 16:07:33 +01:00
7e8ac5077e
correct the order view
2018-03-02 16:07:15 +01:00
bbb12e154f
Merge branch 'master' of git.2li.ch:ibz/web_AI-5
...
* 'master' of git.2li.ch:ibz/web_AI-5:
save the order price in CHF
fix the order price currency_name
display the exchangerate with name and value
remove unused imports
extend the projekt abgrenzung
update the documentation
2018-03-02 15:59:34 +01:00
4672c458d6
show cathegories on side of currencies and orders
2018-03-02 15:59:25 +01:00
9f89b2681a
save the order price in CHF
2018-03-02 15:11:28 +01:00
8bbe18945d
fix the order price currency_name
2018-03-02 14:55:16 +01:00
fded4a80f9
display the exchangerate with name and value
2018-03-02 14:54:54 +01:00
c38a9b1e16
remove unused imports
2018-03-02 14:52:26 +01:00
4fb45dfdb1
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
add a link to the Readme
2018-02-28 22:22:39 +01:00
51c5affa85
delete total of order in profile view
2018-02-28 22:22:28 +01:00
2704848368
for history
2018-02-28 22:19:43 +01:00
fc2af695a2
add a link to the Readme
2018-02-28 21:58:18 +01:00
de24264331
undo currency dropdown onclick and fix price tag in order
2018-02-28 21:47:19 +01:00
404941b235
fix pos_price in Orderview
2018-02-28 21:40:17 +01:00
3a8a5ea1da
refactor and clean
2018-02-28 21:05:27 +01:00
db1fb337ba
cleanup code and refacture visual usability
2018-02-28 08:13:13 +01:00
1e577f4520
improve dropdown
2018-02-28 01:23:20 +01:00
ab30417a80
cleanup
2018-02-28 01:22:27 +01:00
f8a6932bde
delete unneaded line
2018-02-28 00:30:02 +01:00
a18765b0a6
add orders RESTfull
2018-02-27 23:56:41 +01:00
f170f5b0da
add checkout cancel button
2018-02-27 22:16:24 +01:00
9354817dd7
fix excepton if user has no orders.
2018-02-27 22:11:02 +01:00
f6ae6cf872
add profile oders in tableform with
2018-02-27 22:01:39 +01:00
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
a8a27c6b75
add profile view of orders
2018-02-27 20:46:05 +01:00
45d15919cf
change some code
2018-02-27 18:40:05 +01:00
208d7d51df
correct the html templates
2018-02-27 18:21:34 +01:00
d38a37536a
fix delete cartitems after purchase
2018-02-27 07:22:57 +01:00
a1e74a32c2
readd the order url
...
somehow this got lost
2018-02-26 22:51:43 +01:00
91d6b2b4d4
fix the cart deletion
2018-02-26 22:44:47 +01:00
ee4d332a3b
fix the OrderPosition creation
2018-02-26 22:44:36 +01:00
ba61ed12a6
move the post block below the cart operation
2018-02-26 22:33:29 +01:00
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
3073baf43f
remove the person variable
2018-02-26 22:32:21 +01:00
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
b9d2d9f6ae
only query the exchange_rate if the currency was set
2018-02-26 22:24:01 +01:00
865ff557bd
add some empty lines for readability
2018-02-26 22:23:29 +01:00
a232ca414c
move the person up
2018-02-26 22:23:15 +01:00
6c172405ca
add the orderposition modell
2018-02-26 22:22:45 +01:00
45571b8ea9
use CHF as the default currency_name
2018-02-26 22:22:22 +01:00
d51e9dfa08
shorten the order view
2018-02-26 21:56:07 +01:00
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
494ce66631
only execute the currency part if it exists in the session
2018-02-26 21:55:15 +01:00
f62a6a91d9
only create the order
2018-02-26 21:54:40 +01:00
3970555cf1
shorten the line a bit
2018-02-26 21:54:11 +01:00
691fdc12f5
display the position amount correctly
2018-02-26 21:53:21 +01:00
Ivan Hörler
Andreas Zweili