From 35301915beff8065fdcc52ab7b81741ef46911b5 Mon Sep 17 00:00:00 2001 From: seba Date: Thu, 2 Dec 2010 12:54:34 +0100 Subject: [PATCH] well, this is more like it --- k4ever/buyable/models.py | 14 +++++++++++++- .../templates/buyables/itemBought.html | 2 +- k4ever/buyable/views.py | 13 +++++-------- k4ever/k4ever.db | Bin 65536 -> 62464 bytes 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/k4ever/buyable/models.py b/k4ever/buyable/models.py index 9253d84..aba9d77 100644 --- a/k4ever/buyable/models.py +++ b/k4ever/buyable/models.py @@ -34,7 +34,6 @@ class Buyable(models.Model): class Order(models.Model): user = models.ForeignKey(User) - purchase = models.ManyToManyField('Purchase') price = models.FloatField() dateTime = models.DateTimeField() @@ -54,10 +53,23 @@ class Order(models.Model): return "Price %s, User %s" % (self.price, self.user) class Purchase(models.Model): + order = models.ForeignKey(Order) price = models.FloatField() isDeposit = models.BooleanField() buyable = models.ForeignKey(Buyable) + def create(order, buyable): + p = Purchase() + p.order = order + if isDeposit: + p.price = self.deposit + else: + p.price = self.price + p.dateTime = datetime.datetime.now() + p.buyable = buyable + + return p + def __unicode__(self): return "%s%s, %s" % (self.buyable.name, self.isDeposit and " (deposit)" or "", self.price) diff --git a/k4ever/buyable/templates/buyables/itemBought.html b/k4ever/buyable/templates/buyables/itemBought.html index f95f68f..280b0e9 100644 --- a/k4ever/buyable/templates/buyables/itemBought.html +++ b/k4ever/buyable/templates/buyables/itemBought.html @@ -3,7 +3,7 @@ {% block "content" %} {% if not error %} You got the order {{ order }} - {% for item in order.purchase.all %} + {% for item in order.purchase_set.all %} {{ item }} {% endfor %} {% else %} diff --git a/k4ever/buyable/views.py b/k4ever/buyable/views.py index eb36ea4..753a293 100644 --- a/k4ever/buyable/views.py +++ b/k4ever/buyable/views.py @@ -34,21 +34,18 @@ def buyItem(request, itemid, buymode=""): "with/deposit" item and deposit "only/deposit" only deposit """ - items = [] + order = Order() + order.resetWithUser(user) + order.save() # for the id! if buymode == "" or buymode == "with/deposit": p = item.createPurchase(isDeposit=False) + p.order = order p.save() - items.append(p) # TANNEK! if buymode == "with/dopsit" or buymode == "only/deposit": if buymode == "with/deposit" or buymode == "only/deposit": p = item.createPurchase(isDeposit=True) + p.order = order p.save() - items.append(p) - order = Order() - order.resetWithUser(user) - order.save() # for the id! - order.addItems(items) - order.save() return HttpResponseRedirect("/store/bought/%s/" % (order.id)) @login_required diff --git a/k4ever/k4ever.db b/k4ever/k4ever.db index 59f1e3bc808c9b9df86c273cc6e69ffce5737d82..15e28873764e81671decd8505b19068a6f5a215b 100644 GIT binary patch delta 1626 zcmai!ZERCz6vv-)&+Xa`rmMi(z0r1C_ul5d_TEA4GBXMMS{?79npOun1~5R7{nk%KZuDlp_>V42qwm-?dC8@eA0W;`@83! z=YP&~&W*>#_zdo^vJW%H+WEDx>JPN3FnngyE?m*VnZJP>ubUfpH8)jGx`i%m#6Q#a zrE_R!4Nie$z?rzCOqERU-N8}&?a4h*`#V09lSqdpqNR|8nRW=OufhUUW*A>&yf+7LrliS=95w^dXs@DE&$>+2;&!Gc z2aFQD!IR1`%-{_k^8_~6V>kR?q+BVyWEVZD^`ck=c$;Bf5jvItvYMx3!$apk+SXs1 zuh?CNcX<(K@v$Nh8BZQc{>|yPS1ijo&bfl*-}&q2=q2B@Kq z{&OYCkkjh$`QV*KO2xgflEZSEjhnP-YbC90DP0oT`C2$K5ZkzYC`yz4ZPb|vmlUKN zV|a{bc^Hdd0xMf#9klxB#P&7r?(lHTJ(x3*fiPcrB{d#q0PLj^j}-@?G3yw-hn30*D=7AI`1!8Q8@IbW_bQjqD1mBix=)!0l)Te(R-2=Rt z-aMp23!Ogn940DU)HmJe=TcMtIPwF7k?1YmuRoLdGH!ih-LLXmR4GnbbQWvNc&X&J7y__PKgQ>G(8K1y= z4DZc82qA#Y)D;7wtyQ!8BVQgsQ zmS}Br0$ZpxtJCPTgLY+&vfNid#2GFe@8B%Xa4FZ&l9x%@&m3uS<|nKa^FS1H7%^uB zp^(Ygj5u~$OihVmTD*D(oiNV}8J=Q7Q1}kxaEgaL!ZWn_X=F}^b~-h;4ilBFbSAqB zf^;XlfuCg0>}m+{{|$6@_DP%1>S*Vgx@h-YIW3=az~lTS7j@0Gq^{mYTXB9P8~hEq C5U5B1 delta 3323 zcma)8YitzP6~1TA>}#+M2E!UKFkWn9gFT)*kKNgIz?hN;av_E^Y7mOt_3i*Rk3_~6 zMKYKTNz|xS!}#_`Lsf~QNCgF@@&l6}`GcyUpa`|Gm6j@~N}&~wR31?i3H71&&Rs8H zXAPa%Id}KW{l0tdIeYJSk5A$8Qrv3 ztGHRdl>Hr7VFUhaw7ldlmXrEQiMs)Ba!c0X&CzoC8p7JqTl2=&xztFzZcRL$)HBr0 zS_zk04$WlK*?2;CY(1UrveT}W*`0B$By|A5(5c=;jV9et^<>I$Ql_Jsrj@XhkG`QP zYNT{sGaXB};v;ybyd=v(32zX* zJG$W71bQ98weut-E1q@xdVl-w!F}@qN$u8jpL<~XDdk8B?-9I*_jyo%#j2nr697pH zqThm~6nfmpd!k1yB>R3z5-mvRa|DP>_~%3Tz4S3I_PiHH5A59!ss3mvnoPopKwr9R zzuVP+#BVxZ>CL*mov-%yX7;8J&EaLxQxz`sVRVqPwtdUk`*q=99>&^^E#W_d?3cBX z>O5h0HrA-d3bdX4XM@tvUKxybCRy`$D~;mAchchimASo3+2`GLu!>1NmrC-9+9lzy za2HR*HtcwAlN2J0Lw3mA)a~}RPVp@8tNXy7=4ry_F7DTQUft7rEDUN?iR4*6^iHv;qJyyK=RF7CkDJ*3$^V3xzLAd<6$oP{&eG0!`t7`)c4&xGEHFX@NHuvy%fW*z$IT4IC|j)uX46 zZU!hFg$4f&ja10tc``Xi$T@f&K0-!+{+xGu2j*T{!EPOEgc?>ccpg@=OM@Ha+7omY z`|-&}STp*;$v1(I+&W}JBP$Vv*$y3^m=G|v|3yz?38V54mG)+K!l3*U$1L% z_30OPH0zq7cI-|c%r;2f2hw|7b&tz;a=wA~X@ecXJY#DSMk}Eial?sIh#39`rE!m3&O5pjl#{zFpBVjj%MDbSOajF|8gheq5VhLw{ zRyi~lEc2y~OW+x)UHUf;c;0r*Ev;skhuYXDV-;*UdnOzUMcb2*dzxJxs$y@jm8}1Q z|6(D#!V>dyb*n?s?QM{Iwwu@ShirIk89O%?V++QYvY%ckXWxv)`EJp8VGA1)o~=;J zu3xag;QK>6)UlVxZ7}(Fm5q+C8~H$9Fe;yy!evJYIYPdKUr5`f+sLg$t5L|X{Ql0*`c~VW!RP~rzAA2Cn4Y{gydBV1D6Bb0??W9&F;ba_h#&{22a}l3h zvSa2b4fIM5Ge#;KsUF%(U#f!v~e{x3}|E}MZ&i3DAlXd0Qij}?*>KwfRk zAB4Up_%;5M%hVKB`TqP{2^GAq7nzQX*{7m*pb; zwSed^#Q0nNZ*UpDPVoA}n@906)`;jhBUvf9^M`<0=rh;lh2oe7^#tnSeg4n=2K$G- zC4f0>Vn-)!XyKDy#U>^-%q`Q{Q+GDOdNz1xCp5D^-T4k|;NR=mf9`}?``tL`?6tcV zw6cqLw_q+z+3;-}HnLl{cZ{5s!&rvrS?JvrJh~rYn~08!JkMaMuqDFI6IKy6B5YXL zkg!2vMJ|Bd{&jQ)<@fxTil9^kr6MR5L8%BzMNle&G9oA=f-)i~BeKsBLEnZ&al`OG D35Y~-