diff --git a/controllers/__pycache__/__init__.cpython-35.pyc b/controllers/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7c169b8aaddba8b2b4442754d10c52909a77be7e
Binary files /dev/null and b/controllers/__pycache__/__init__.cpython-35.pyc differ
diff --git a/controllers/__pycache__/main.cpython-35.pyc b/controllers/__pycache__/main.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4ff2daf5133a1b74b665ff21ae3876838ba652ff
Binary files /dev/null and b/controllers/__pycache__/main.cpython-35.pyc differ
diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d2d86b04b81ce7a25336b5cc45748d6f5a404672
Binary files /dev/null and b/models/__pycache__/__init__.cpython-35.pyc differ
diff --git a/models/__pycache__/delivery.cpython-35.pyc b/models/__pycache__/delivery.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2d10ddd509639d3d0e98575008c0962c96f0c4e9
Binary files /dev/null and b/models/__pycache__/delivery.cpython-35.pyc differ
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
Binary files /dev/null and b/models/__pycache__/sale_order.cpython-35.pyc differ
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
Binary files /dev/null and b/models/__pycache__/vracoop_point_retrait.cpython-35.pyc differ
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
Binary files /dev/null and b/models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc differ
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
Binary files /dev/null and b/models/__pycache__/vracoop_retrait_time.cpython-35.pyc differ
diff --git a/models/vracoop_point_retrait.py b/models/vracoop_point_retrait.py
index 678d848c9ae757e20ec2e099fc05da357c543f5e..cc3c802afa561be6fa2a5a6f6a2d5dafc1eddb2f 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 d8e2a2f1c6b8708956d98b0cf1e87d3e54c3058e..60ed37372ddda0720c2ecf2ce9fa5bc9a45ed8f5 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 5409d6f3cbaa49e43ffa0c3e53fec319d4488142..9b29d02289bc7af039ee16b4176a9ecfe126f8c7 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 fa1f6bb256ea19d6ee626607ca3113c8b2a3d434..a3be104ab8f1a00b22488dbecd37d0e788078fbd 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">