From 27bf1c95757112df66c44dfa4d628db44f8919e6 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Wed, 23 Oct 2019 16:04:05 +0200
Subject: [PATCH] Bug sur les dates local
---
.../__pycache__/__init__.cpython-35.pyc | Bin 0 -> 197 bytes
controllers/__pycache__/main.cpython-35.pyc | Bin 0 -> 3091 bytes
models/__pycache__/__init__.cpython-35.pyc | Bin 0 -> 376 bytes
models/__pycache__/delivery.cpython-35.pyc | Bin 0 -> 510 bytes
models/__pycache__/sale_order.cpython-35.pyc | Bin 0 -> 1588 bytes
.../vracoop_point_retrait.cpython-35.pyc | Bin 0 -> 5788 bytes
.../vracoop_retrait_suivi.cpython-35.pyc | Bin 0 -> 1168 bytes
.../vracoop_retrait_time.cpython-35.pyc | Bin 0 -> 2326 bytes
models/vracoop_point_retrait.py | 24 ++++++------
models/vracoop_retrait_time.py | 37 +++++++++++-------
static/src/scss/style.css | 4 +-
views/vracoop_templates.xml | 8 ++++
12 files changed, 45 insertions(+), 28 deletions(-)
create mode 100644 controllers/__pycache__/__init__.cpython-35.pyc
create mode 100644 controllers/__pycache__/main.cpython-35.pyc
create mode 100644 models/__pycache__/__init__.cpython-35.pyc
create mode 100644 models/__pycache__/delivery.cpython-35.pyc
create mode 100644 models/__pycache__/sale_order.cpython-35.pyc
create mode 100644 models/__pycache__/vracoop_point_retrait.cpython-35.pyc
create mode 100644 models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc
create mode 100644 models/__pycache__/vracoop_retrait_time.cpython-35.pyc
diff --git a/controllers/__pycache__/__init__.cpython-35.pyc b/controllers/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7c169b8aaddba8b2b4442754d10c52909a77be7e
GIT binary patch
literal 197
zcmWgR<>flBy*##$fq~&M0}^0jU|?`yU|=W~VPIfLVPHsMWXNG)$Yo@RVq{=UVPXi@
zWPZuWz`&r%c#9=BF*DCklj#;i5lGich9VXQ1_<#hP(LF-H&s7BB|jfb7#is(mll`g
z=jtb>q~zxn>z5TJCg<lD#3$!uCTGVd=B30Z=jY_4CYR_Z=jW9af!IaG`tk9Zd6^~g
Y@p=W7w>WHa^HWN5Qtd#t6oZ@$06SVU8~^|S
literal 0
HcmV?d00001
diff --git a/controllers/__pycache__/main.cpython-35.pyc b/controllers/__pycache__/main.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4ff2daf5133a1b74b665ff21ae3876838ba652ff
GIT binary patch
literal 3091
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
UVFL*qJ5Y)PS2SYaVn=`(0KpmYivR!s
literal 0
HcmV?d00001
diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d2d86b04b81ce7a25336b5cc45748d6f5a404672
GIT binary patch
literal 376
zcmWgR<>j(IwK7(ek%8ec0}^0jU|?`yU|=W?VPIfLVPHsMWXNG)$Yo@RVq{<h@tMGU
zCWa^`2%j0uXJ&|EhVWUyd=`c%76_je%x7hYVr5`VVPgo^WPi!Xz`&r%cuTabC^0!d
zzaYLKKQpf+z9_Y%C^54{lkt`aOadwtUy_-dimU-9UR;`4mZ`~ji>o*>CpA95C?&N>
zlkpZuN@`AKS!z+GpC;Qah9Z!UikKM~7>Zax1S^POV_;xd$xy@rVuOfZKKdE?xvBd3
zDf#(e!q7-RxwN<>KUY67B_%(vSRdx3<ebdp?D)jIl=$TQoSf9;68+r#l+>JJ{rLFI
fyv&mLc)fzkTO2mI`6;D2sdgY6i$N9$FhU>z!*XA0
literal 0
HcmV?d00001
diff --git a/models/__pycache__/delivery.cpython-35.pyc b/models/__pycache__/delivery.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2d10ddd509639d3d0e98575008c0962c96f0c4e9
GIT binary patch
literal 510
zcmWgR<>i`ka%HSKBLl-@1|-13z`)?Zz`#&!%)r2q!oZNi$dJRpkjuyr#mJD$#1O^A
z!04XB#E`<w(82&BQ<)gDm>HUx8KPJiQdk&*HCbPROw(k##g>+tnv+s|i!C=lB{iow
z86*tD%rILt7#J8*89;`oFn|nCVPuG6W=LgW$YN!HSkuhF7{vxP`j%K&QDSm_et}DB
zPG(tZQKfTYQBh`UQI$XnR6s8oB65qZxTGjEFTIL4AU`v&M4>3Pq$n}7#7~p`7Ds%1
zUSe))eEco0`1suXl+qj!n<qZLurx6TD#H<<nU|4Tlvz^5#K6FCi`^+dKPNRYFN(JS
zWLiAbw3Q4++zbp5;+KzpMt*Lpett@RKA12x(oZfeF3Hc;PfSV4&nwn1gE&1tIVUqY
zJ3cWlB|bSnCnq(zL?04B`fxuKR2G4vfgKbLAO;U38xvT>Pm}c)3&;krvx-2Wc#G8+
c6ue+*glixy9+2BPY#@HL1DR9|@{SlY0DuUAMF0Q*
literal 0
HcmV?d00001
diff --git a/models/__pycache__/sale_order.cpython-35.pyc b/models/__pycache__/sale_order.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b955cd24c485388e55b48211e3285527f942667a
GIT binary patch
literal 1588
zcmWgR<>h+hxIQ+Im4V?g0}^0iU|?`yU|=Y=Wnf@PVPHsMWXNG)$Yo@RVr0l=Vu)g5
zU<8RWG2}2agt(_LGo-LEv@n3kR7Qp@7KUbKhA38s6jp{{O}3XHb2XW6vE}Bcq~;Xg
zVoS?R%}FWNWW2?wl?;-DVOE%>l?)6FsSF^yQW!vXr7$u?F*BsHFl4bZq%bi+tV>~K
zXl7uFVgrk_Go-LFG&3?pae%p;3@PkjE*C=z2SW-cLkbr|3nN1mH<-)KkirAz@_@O#
z3@LnIE-#21tjT|iGdM9P)xRhuwWx}#I58(xFCWCd#gm*5_CkDKVs2`cXjxHWa(;e+
zUO|3lUWr~&YDrOIX2~tK;*z4wy!0yG0FbZ(RJe-YE5EczA*B>9AmEW&T9k?;;+M<>
z4G2)+GczzSID;a<hk=2ihJhiAfuWg!ff2-F1jUAAEfYfxBSXF>Lk$x{7MR`4$WY4+
zR?7?ur5a{XL}W68!hx}bm7#_i#0u7A_QU0L38;_a!9I$IIz2u!MU(9oS885yX;Er?
zeqQP==G45hTWm>1`Q^o_w^+-IGD}i#F=eLQVoA!+&(UPL#ZsJ_lNKeAmS2>dieyR@
z4>(AIAORJ{4mE!zLy-Uj1H&&r{fzwFRQ>#v{CqHBXr!N9T3nK!tDl&XlAl+s4|82|
zPG)j;d}3Zod~$wHPHJ+AJ~&p2^+8b;4~{Cmg34Qb@yQvf$=NUmfb1yd0);Rm7b7o|
zD5Drtl>|JV^-vX~L<JixDpFCRqJ$9??#&DgkeJ9~21N@b4oVoovBJUt3HB5w2FYed
z7>60mX=Y}qWduhS8z|S*Ffu@63X*61elhC4WMp7qC;}0;xKk1<VIB$5WG~`mU|_h#
zk&;-FT9TQYdW*FrKP9p97He@qPG-q1mdez`qFc<Fc_l?W3=9mKEJgevgG51uI7lON
zN@68A%prszNQ^tav;bsYd`e=aBq-g1v@$SqG4U|+GiovkGgXNq1r|arJfuJg7L<X(
ziPjG#q-q!$vcQQJ6go@{B~0Mt3C_ooHB2DyOQta~h=F7o!9l_dDmjpXgpDCslilwZ
zqg55FYO$VbF*s0)L_qH5$;dA)LIe#9IB1F_KvJw}Ir)juFkps+fgDJj1*8Sybx@)x
z0{fo_=6{f+3Mc@eX@!ZOQI1iVsY(pf`yi#7e788_!39Em{4K8d_}u)I(wx-z_**>j
z@r9*{IiR8<KK>R*d}dxoYEfoM5h$E)arh?YRT|~zr5163UF4Ejl3E0cpj)hNU`K--
zS|kLDF&Pk{2qM6aMGzoo7lA^Y9pqY&S{_C=CQe2+Movb4Mt&xKPJV8%yq_l9Ef!F=
sDgqTSU<VY5fvjcq1r^9(HAuk$wgF`LEe;!qZ|pz?QZa}SW8`820O*x+OaK4?
literal 0
HcmV?d00001
diff --git a/models/__pycache__/vracoop_point_retrait.cpython-35.pyc b/models/__pycache__/vracoop_point_retrait.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b5d9600f0cb55030e343858a1a3a2f866157a17d
GIT binary patch
literal 5788
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
afkeL@C_alpqct+jT#Q_dN{n1gVoU&rJbZ%y
literal 0
HcmV?d00001
diff --git a/models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc b/models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8c8ed7eaa85b933b1930be2b6f2aedbb8c1b35de
GIT binary patch
literal 1168
zcmWgR<>k5`u_3manStRk0}^0iU|?`yU|=XVW?*1QVPHsMWXNG)$Yo@RVr0l=Vu)g5
zV02GmVn|_TXkh@6sf-L+%nZ%U3{fl$DJ%@ZnyfEDrfD+WV$01>NzEy~#g>+tnv+tT
z3=)Q6PM9rI7#J8*89;`oFn|nCVPuG6W=LTI8JEh+ki`bFBZY;bnTa8aodGJs%8<ea
z7U6)2urs7^Fr;uYq;N4bGcZMQg2lNQQe+rXWEoQA7*gaJQWO|c6d6*K7}D9nDkT}3
z85yIv!76#cB2o;^42)5{3@OqK!J5jqgu{vwlk@Wnf>KM05;IGJOEb$dt3=Bnf_g;|
zQN3cYupC%cAtkj~Avr%cH!%;yO3hP%s;c5DPRvQw%P&evEh-gfU|{eo%{{!bC|@Bd
zKTjbg6|Sd>yC}6-uOP9gBrmn-7MpWUW@=u^EuQ3ja8SnQCFZ6gTu_jonO6dH$1S$v
zlA_GK^eWx}kTA^RTdX;yc`2E<SbZQ=ZekIL=L@Dda#M?vi&9fEZ*lm-Sgcv8r63hv
zV2YzGH7^CCA`Hf2D^AP>>0t|o&>Sh5xruqn8L788T%fEfey{w}B88Mvm@}#bJW@-G
zQjtXbG?}U(ZmWX04a5h#u8I}xI!&f3xcjQ$?gOa;yReEC>_U(#m>a7&U~bf8s)D+*
z3hGLbI+#1F;O^AqyTuU?4%PVhTU_z+x%nxjIjQmSw|L^?3riDoK;a!9e~T5Y<Q7kS
zN@{U(QD#9&W`14~GXn#|Ee_wryh@||ywqD9;JA&?Ou5AcjXn@t0-9Rl!EqH2O${I!
z&fwIX)MSuJx42UhD`8T%Slx2+6H9LKWaO6?!30+_6e%+>K!{(F`WgATsrvaT`T1bN
z&`3YIw74WcS3fZ&B|ooNA7*88PG)j;d}3Zod~$vc$S!?wB0?yDxdxnq^$IGBKv|z1
zl=YPu7#MgM*%;ZFgcyYwIT_i&n3)j)IT<+_!Rq}qS#Pm`98<&uaw0fXSbaemA1sY<
WIE1AF4mBG{K-+;VEC%TlV+H^`3R=Mc
literal 0
HcmV?d00001
diff --git a/models/__pycache__/vracoop_retrait_time.cpython-35.pyc b/models/__pycache__/vracoop_retrait_time.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bba385045c638fa73cf2be9ece5632636c32c39d
GIT binary patch
literal 2326
zcmWgR<>lHDxgpkzlY!we0}^0iU|?`yU|=ZrVPIfLVPHsMWXNG)$Yo@RVr0l=Vu)g5
zV02GmVn|_TXkh@6sf-L+%nZ%U3{fl$?kOw`DXd@#RtAIwD?<t!L$D_MOOQ31Ot;u_
z^HWlDif^%{Wv1q&6eoj(VVDzU{c8pWhExWSttkv3TT>VrqL>*{m_YWVvNB|`fh<p9
zVQ6Mzh+<~|iEuEaC@`cbGNdRmq$o3_s4%3cGNh<6q_Z=m2s5OJFf=nVMsb2wa)Cue
z8JZawqqvbo#K0mvNFw535ndz_39twsl87W&gda&n3M?W377=7fk!EOSWQY<1bJ-YD
zWEfIp!48mPXl7uF5@tw|X9(6*za<n_l$e~KUl5d9Qk0lk5|WvlS|w5j5z{Mz2<nx9
zL=`>r((;RP6H7Al^NJNR@{1BPi&Bdf3KEMHpz5l4U>d<1IGywJ(iA|<my8Sy47XT)
zO7l`OUowH&zKKOCnJ<|^Y!2VlqU55~l+2f)WN?esE44Hw^Cc@-Dl9cG1uVq|;<5!N
z=BB1(7J-f9aLLR~%uCKly~S2sQk0pOUM1v}Us|M)lB$rCs8F1mo0yrGS|#I=T3VE<
zkW#8(m<o5Of(FPNd74!UaM_g9qP$E@6{SiH3=D8ZC`Kd}6dhhstecyelBrp$hO7+3
zEEJ`p3=9k*sksHkAeR;t9bQ?GSOgB#QW<2K+|1%sg~JOJQZkDR@{2P;p&rHRm|T*X
zc8e!DADo!u^AdAYt3+XeUXY)eR|1Q(D&7DP7Zx>snoLEY5G?|Qqb5@kI|Bnl5eEYU
zgC<iEDD@X{LD<|NaUKYp7sTd+u=zo30SFru`bB~uw#Y4xc(5bl<8N`r$LHp!l;)(y
z$KT?Kk1s4u%mFzsKK>RfSjjD(_>|P*<f6<1kXMSJF`t-MX_TLrdW#?GiFi<QiO)>A
z#TlHMlbQ@tdW!{Q&Mj8AoczR+Tf%9XMa3oYx%owTnR)5)8KBs`C6tqhAtnG(n3tcQ
z2UW!nR)r)WP*9W#3w*G}w*(W*5;JoWlQMHMODZ8k>`wXlIjM<xx406MOESw+<5LnV
zZ%M$M3l8&mX!?)OOj*fLqz(!y5b-NQKO;XkRX;x^KOamO8tEsO7MJAb>L;e8<mVOZ
z!%Rue$xP0UPs~e+PtMN)d0QVGzX$~|3qYZxS5R35$|#^HEH+?ZVBle7V`O6zVq{}v
zMuMD-oLoYToQ#}|Fj9z-pOKT1jS;LHd-=DCaQP<%Dq5h$i5#dDNl^foc7hBkLg3O4
zUM>oP${SE=2PywJ7*YhmB_ac36c@Nyf`}lOh!7Fv5)mSTTp~h5U?pOTBtx*K;w^4y
zF$ONbP>Ufs=ls01%=A)7CPNflDX9uciN&diY=OuWh%8YA&k#lM>`(;H4B&zYoE3_M
z7#J9aeE|e3MXDf0IkX(9Vg(oG(2}GIUYu((fkUqfQlM)xfkUv016HJKGJylK3R<XZ
zGJ!+03SO*h@)wDKvJ$AgED{5;#6g4vhyaxyMbaP^sLU*q1+nBnggl5)01=8H0#tez
zDT7#`42j5^MH(P6O$G)A9Z;(SRC+^l5k?+@=N?E-Dgx>8(`38F0?O4zpt=lFl(G7P
hnit@#1y+M(7uaf$g||3tAVs7dDE}6N2r*_!RRCHFOpO2l
literal 0
HcmV?d00001
diff --git a/models/vracoop_point_retrait.py b/models/vracoop_point_retrait.py
index 678d848..cc3c802 100644
--- a/models/vracoop_point_retrait.py
+++ b/models/vracoop_point_retrait.py
@@ -69,13 +69,13 @@ class VracoopPointRetrait(models.Model):
def slot_calculate(self):
self.ensure_one()
LIST_WEEK_DAY = [
- ('lundi', 0),
- ('mardi', 1),
- ('mercredi', 2),
- ('jeudi', 3),
- ('vendredi', 4),
- ('samedi', 5),
- ('dimanche', 6),
+ ('lundi', 0, 1, 'lun.'),
+ ('mardi', 1, 2, 'mar.'),
+ ('mercredi', 2, 3, 'mer.'),
+ ('jeudi', 3, 4, 'jeu.'),
+ ('vendredi', 4, 5, 'ven.'),
+ ('samedi', 5, 6, 'sam.'),
+ ('dimanche', 6, 0, 'dim.'),
]
for rec in self:
my_datetime = datetime.today()
@@ -95,17 +95,17 @@ class VracoopPointRetrait(models.Model):
exclure_the_day = rec.vracoop_retrait_time_ids.search([
('vracoop_point_retrait_id', '=', rec.id),
('active_day', '=', False),
- ('name', '=', week.strftime("%A"))])
+ ('name', '=', week.strftime("%w"))])
if exclure_the_day:
pass
else:
- print("----- week.strftime -----", str(week.strftime("%A")))
corresponding_line = rec.vracoop_retrait_time_ids.search([
('vracoop_point_retrait_id', '=', rec.id),
- ('name', '=', week.strftime("%A"))])
+ ('name', '=', week.strftime("%w"))])
for week_day in LIST_WEEK_DAY:
- if week_day[0] == week.strftime("%A"):
+ if week_day[2] == int(week.strftime("%w")):
byweekday = week_day[1]
+ day_short_name = week_day[3]
time_available_week = datetime(
week.year, week.month, week.day) + timedelta(
hours=corresponding_line.availability_time)
@@ -219,7 +219,7 @@ class VracoopPointRetrait(models.Model):
return_slot_list = slots
if return_slot_list:
vals.append(
- (week.strftime("%a"),
+ (day_short_name,
week,
week.strftime("%b"), return_slot_list))
diff --git a/models/vracoop_retrait_time.py b/models/vracoop_retrait_time.py
index d8e2a2f..60ed373 100644
--- a/models/vracoop_retrait_time.py
+++ b/models/vracoop_retrait_time.py
@@ -10,14 +10,23 @@ class VracoopRetraitTime(models.Model):
vracoop_time_id = fields.Many2one('vracoop.time', 'Conf time')
name = fields.Selection([
- ('lundi', 'Lundi'),
- ('mardi', 'Mardi'),
- ('mercredi', 'Mercredi'),
- ('jeudi', 'Jeudi'),
- ('vendredi', 'Vendredi'),
- ('samedi', 'Samedi'),
- ('dimanche', 'Dimanche')],
+ (1, 'Lundi'),
+ (2, 'Mardi'),
+ (3, 'Mercredi'),
+ (4, 'Jeudi'),
+ (5, 'Vendredi'),
+ (6, 'Samedi'),
+ (0, 'Dimanche')],
string='Jour de la semaine')
+ # name = fields.Selection([
+ # ('lundi', 'Lundi'),
+ # ('mardi', 'Mardi'),
+ # ('mercredi', 'Mercredi'),
+ # ('jeudi', 'Jeudi'),
+ # ('vendredi', 'Vendredi'),
+ # ('samedi', 'Samedi'),
+ # ('dimanche', 'Dimanche')],
+ # string='Jour de la semaine')
first_morning_heure = fields.Float(string='Heure du 1er retrait (matin)')
last_morning_heure = fields.Float(
string='Heure du dernier retrait (matin)')
@@ -37,13 +46,13 @@ class VracoopTime(models.Model):
_description = "Configuration horaires de base"
name = fields.Selection([
- ('lundi', 'Lundi'),
- ('mardi', 'Mardi'),
- ('mercredi', 'Mercredi'),
- ('jeudi', 'Jeudi'),
- ('vendredi', 'Vendredi'),
- ('samedi', 'Samedi'),
- ('dimanche', 'Dimanche')],
+ (1, 'Lundi'),
+ (2, 'Mardi'),
+ (3, 'Mercredi'),
+ (4, 'Jeudi'),
+ (5, 'Vendredi'),
+ (6, 'Samedi'),
+ (0, 'Dimanche')],
string='Jour de la semaine')
first_morning_heure = fields.Float(string='Heure du 1er retrait (matin)')
last_morning_heure = fields.Float(
diff --git a/static/src/scss/style.css b/static/src/scss/style.css
index 5409d6f..9b29d02 100644
--- a/static/src/scss/style.css
+++ b/static/src/scss/style.css
@@ -183,9 +183,9 @@
border-bottom: 0px solid #dee2e6;
}
-#retrait_method h5, #retrait_method span{
+/*#retrait_method h5, #retrait_method span{
margin: 0.5rem;
-}
+}*/
.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-primary.dropdown-toggle:focus {
box-shadow: 0 0 0 0.2rem rgba(0, 160, 157, 0);
diff --git a/views/vracoop_templates.xml b/views/vracoop_templates.xml
index fa1f6bb..a3be104 100644
--- a/views/vracoop_templates.xml
+++ b/views/vracoop_templates.xml
@@ -7,6 +7,14 @@
<input t-att-value="point_retrait.id" t-att-id="'point_retrait2_%i' % point_retrait.id" type="radio" name="point_retrait_type" t-att-checked="order.vracoop_point_retrait_id and order.vracoop_point_retrait_id.id == point_retrait.id and 'checked' or False" t-att-class="'d-none' if point_retrait_nb == 1 else ''"/>
</a>
<label class="label-optional" t-field="point_retrait.name" t-att-for="'point_retrait2_%i' % point_retrait.id"/>
+ <t t-if="point_retrait.street">
+ <br/><span><t t-esc="point_retrait.street"/></span><br/>
+ </t>
+ <t t-if="point_retrait.street2">
+ <span><t t-esc="point_retrait.street2"/></span><br/>
+ </t>
+ <span><t t-esc="point_retrait.city"/>
+ <t t-esc="point_retrait.zip"/></span><br/><br/>
<div class="collapse" data-parent="#retrait_method" t-att-id="'slots_point_retrait_%i' % point_retrait.id">
--
GitLab