From b6363dd7e7cc687712d58031fa2c8ec7b403b732 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Wed, 10 Apr 2024 13:59:13 +0300
Subject: [PATCH] aa

---
 .../__pycache__/models.cpython-310.pyc        | Bin 4025 -> 4021 bytes
 ...lled_at_remove_item_created_at_and_more.py |  31 ++++++++++++++++++
 ...e_item_created_at_and_more.cpython-310.pyc | Bin 0 -> 843 bytes
 osinaweb/billing/models.py                    |   4 +--
 osinaweb/db.sqlite3                           | Bin 999424 -> 999424 bytes
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 osinaweb/billing/migrations/0022_remove_item_cancelled_at_remove_item_created_at_and_more.py
 create mode 100644 osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc

diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc
index da952b3bb5515e0f902594249cd01161c347e608..777f410dee547b98ed3acd25d476db4b033a5235 100644
GIT binary patch
delta 810
zcmY*W&1(}u6whono89b3V%kR2HceDo+}clTMJQshr6m^IXcciSgf%m*k)#Qe4Wb?@
z)N3z3MZrt)P$*vX;6d;&@DC80n<xJb-`k+ldCYI-_rB-NxBS<<-L&mQ1lK_;v-SOp
z{aRtq;Xv8Sp5iKsxvzMA+~W4Dh}X}Zjfk6sh3HfG5xvK<P*4Zi04%6uEC-L&JxIjH
z`}#4L9#NU4S}cuXF$-2>pNdncca^TT?APjo%jq697X6*7sFP-<r%~6MJ3`JPIb!lO
z9<q;M7OrT=Y!XuO0X7d~@fWcos$DpYU)wm3w{CK=(+-*qA<MG4g(c)Dh0PNb$gZ^m
zKj^gORU*ccABg3esB=%}9Z}&(<wdl3YRj*2S%euqms~`JGzcaUa<Hjq^K`4?KCv`p
zMcnO8c%x74Cb)tU#nG7}`lQEHWEL`2*oaQ(5!+Y2B-e1L@vgBhxsatmG~^}BboWS+
zSv+M1!BxT|RJhUJQ2rU$+?2G)(<X2b;JO{NBn>6(TaLnrkr`Y;?pdvltUmVJf>->&
z)9C4b0CUFtPzlX6^fu+vBPo_*4$2uOOR#Hfv&-<?nAV2SD2HJ<F~>%roS4WLNU=`v
zzuqmPs{||XA@LSNXU%heLm!wfhVGd&T7f)nLs`kePxF}FgwNLD4H|D4+qITNwbt<K
z;V;SYFdc$t&|g);UkXc>$r6^lK)18--u`&9WYwW=-#HT_1@d@EaG&4~f){W3&l+MU
bz-E6rFSW3N5^N_|%v8ERZKU<ImNEVS6HlrS

delta 795
zcmYLHO-vI}5bo=~Zg;oarIeo*1Xl<lX-WY_B$|+rf*3%AL{EFEYxiMFT1uu%JaEuN
zuUs5|uErP>qltL%V7zek=#fo4c{Rqn7iYF1?qt8+@6FFQGkKrgFK)J-%~}b1_TLQb
zoP5eYO^O%zD!DV?7f7<qQPS&Ia<|KDVgtl_V_%loVBiEjPZC}s$lXqqdePM$;74Of
zOTsYzF~{($HY?8IFKt*9F)b&>d7PGyC(IQ;RI3fu3_Pn2ibzoNL(i`Jdv(=p#te^T
zxlp9WjD!@nv_+oGCUb;?zvcU-S@M;Vk-q9TC<88bskwYs11@z><gNCef;l4Z1Qh54
zeGGGWnmR4a&~KD(-`iF7uoLM!jb^9-7Vw*Xn5vSmjBDw|%?Xa`Sw855?UsUVXj7bm
zNiMU%Fvfnp6Z+vn2d?o+g}^g{162!XI+$WA_x(lyRXk0PmacP<$-o`B^mcLtJZnzR
ziCjEqzknHZjZv|Li^lX-sVt@KW`ZP{b|gJJkhJquWNtyAU@cTFxJ)(fl(g=cLquSZ
z0PkAG3p_(C7WW;c+MEO|8p#IbV%eN8tP|x;bqoR{!HpCJtmC11UtGbT=8Qf<4j9Fv
zH78uWX-&C2J8UuhSJ-5_!BD}M)^kd&WX5ydR5~q*NbdP9{H_h_D;(wG!_2H0!{f|f
zx-B2<w^iOsTp_YoRK3yioAGsla$J<aGkLMKc%`xMHhW^>690|kv+V1x@LA6_hkHh6
gij+>A5mCV(&LcfmTE}|NjZ8k@pHJtFygq3D13lif+5i9m

diff --git a/osinaweb/billing/migrations/0022_remove_item_cancelled_at_remove_item_created_at_and_more.py b/osinaweb/billing/migrations/0022_remove_item_cancelled_at_remove_item_created_at_and_more.py
new file mode 100644
index 00000000..29621746
--- /dev/null
+++ b/osinaweb/billing/migrations/0022_remove_item_cancelled_at_remove_item_created_at_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.5 on 2024-04-10 10:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('billing', '0021_remove_item_recurring_cycle_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='item',
+            name='cancelled_at',
+        ),
+        migrations.RemoveField(
+            model_name='item',
+            name='created_at',
+        ),
+        migrations.AddField(
+            model_name='orderitem',
+            name='due_at',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='orderitem',
+            name='purchased_at',
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]
diff --git a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1ca79d5e827b14bc39755aa76f876b2aa33bc203
GIT binary patch
literal 843
zcmZ8fO>fjN5Ooq~H%WITPL+TQC!|QIDLo@pqzW!jBnp=tu)LY+lCATBlThs$uKOdn
zAn})c<;0aE5+7q{X}37?Wb8MddGqXMK2I2pFYW&M?SQdwcCkA+Eskk+_sIYQPqE6&
zy~@vhk3D1HL-2_~fZi(j7~}!)GnR(mDVC+aNvd+GWnVURXC_qxsJg;JyTg`0rrEtE
zgDm%e<vw^zFAtEfLR$d%#^3tk)}O!xrZ`<iV83|dL$a~)c7N~x{Uy(1m=UqLiC_F<
zMD(VMQmL|Dn)LAS=%LV9H6KuvJyzrwgVuzJVqGW{vIbE#8V$FwnH91wP$>i<d)KIK
zPSmoZ2xpT*qwF1S;zk2%cW?p&CF@_)nQ)<GeL>-aQfZ)LYF}G1On6?R0yAp|UA&W>
z%W;|}CK9fI5GD~s1_t6K%uI;)gH*PtT>-XO1J*@}o%U_Iy;rWUr!Hyq1i*QkE}NP7
zggA~!(zLj}tFKJov23jQ`8j*jq3$xQN`=&NxyI}SyNkYQvoop6>fUqN+QrMR?2D$#
zny##6R^z2}U?uBiGj3kuBHK!yUB8Ts#6P+r{;s$;fh$d~F65wHYx_ngG`k06BIXDD
z4-b9M_xNwlcmFew{~8hNML*oh)0CTdq<H`fr<oJSf!9Ke-d(C-qDQ0pk3Cz|R=?%%
G2Y&&fN$=wT

literal 0
HcmV?d00001

diff --git a/osinaweb/billing/models.py b/osinaweb/billing/models.py
index 12065f13..f995c524 100644
--- a/osinaweb/billing/models.py
+++ b/osinaweb/billing/models.py
@@ -21,8 +21,6 @@ class Item(models.Model):
     type = models.ForeignKey(ProjectType, on_delete=models.CASCADE, blank=True)
     amount = models.FloatField(null=True)
     recurring = models.BooleanField(default=False)
-    created_at = models.DateField(null=True, blank=True)
-    cancelled_at = models.DateField(blank=True, null=True)
     active = models.BooleanField(default=True, null=True)
     def __str__(self):
         return self.title
@@ -51,6 +49,8 @@ class Order(models.Model):
 class OrderItem(models.Model):
     order = models.ForeignKey(Order, on_delete=models.CASCADE)
     item = models.ForeignKey(Item, on_delete=models.CASCADE)
+    purchased_at = models.DateField(null=True, blank=True)
+    due_at = models.DateField(blank=True, null=True)
     recurring_cycle = models.ForeignKey(RecurringCycle, on_delete=models.SET_NULL, null=True, blank=True)
  
 
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 088ee3456343ba98b14f3cc7fdd867ce8cd4e76d..4f2c84fd1f1fd24bc3efeb7a48d294f680bb4532 100644
GIT binary patch
delta 413
zcmZo@ux)6toggh(&cML%1&BWbF((59<Fko6#*F0~6S8#}o0`w)w4c#o1Y#y2W(Hyw
zAZ7((HXvpPVh$kY1Y#~A=H7lrhsUCrS(vM9I{N}1RVJ>k&4LGFxYAP^nb;Vl8`&L`
zGIMe=^U@6rjEv%oQgidmQsXmAQgh>z6Z4W&b8=Es;uA|yC5loLOCZ9Dc`5O^`9-Nl
z21X{j1}3_O1`37-R;K1wriOaPmc~W~2JIhL@ofLNidSH%JWD+TKjRDrzInVed5-X~
zaL02ca4zGx%Q%CbgDr<;<93Arz6wU}=D;R9c5!`urZ)fW7X$fbGwSImD5aF90$rh`
zkOH(=!7tRu2PjrhT9llTSPXUulFas;U_N0+TlR$vM(pCMs!Z*|C5cHnsZd`6z1HmC
n<Or5&i${@ZHiwDpPyct7S8n=>5Wd~hIj{4UZRZZ-`}z_9oh^p)

delta 222
zcmZo@ux)6toggh(#=yYv1&BWbF((59<D-c>#*Aef6S8#}8=KGQw4c#o1Y#y2W(Hyw
zAZ7((HXvpPVh$kY1Y#~A=H7lrhsUCrS%~Z7boK>2s+$E59OY{NxQb`{$5p%nOXb-Y
zGVn7VW8j;|JCo-K4-0oZR|4lUj=PM<*g4p8Sn9Vc1n^ZbP7X-W<8D@NvSSz5*Jo-i
zp1vlWuY7U=58HNyAU-+9?K#1G!i?O_nN5!D;;O1l?ZVUlUFDUVek+7;_w?)6cvo!a
J4&(d!5&-IdO2q&G