Compare commits
2 commits
91301fc271
...
9d614ed79e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9d614ed79e | ||
|
|
fb1efb0474 |
3 changed files with 17 additions and 19 deletions
|
|
@ -134,7 +134,8 @@ class GroupOrder(models.Model):
|
|||
|
||||
# === Home delivery ===
|
||||
home_delivery = fields.Boolean(
|
||||
default=False,
|
||||
compute="_compute_home_delivery",
|
||||
store=True,
|
||||
tracking=True,
|
||||
help="Whether this consumer group order includes home delivery service",
|
||||
)
|
||||
|
|
@ -255,6 +256,11 @@ class GroupOrder(models.Model):
|
|||
else:
|
||||
record.display_image = False
|
||||
|
||||
@api.depends("delivery_product_id")
|
||||
def _compute_home_delivery(self):
|
||||
for record in self:
|
||||
record.home_delivery = bool(record.delivery_product_id)
|
||||
|
||||
available_products_count = fields.Integer(
|
||||
compute="_compute_available_products_count",
|
||||
store=False,
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@
|
|||
<field name="period" help="How often this order repeats"/>
|
||||
<field name="pickup_day" help="Day when members pick up orders"/>
|
||||
<field name="cutoff_day" help="Day when purchases stop"/>
|
||||
<field name="home_delivery" help="Enable home delivery option for this order"/>
|
||||
<field name="delivery_product_id" invisible="not home_delivery" required="home_delivery" help="Product to use for home delivery"/>
|
||||
<field name="home_delivery" readonly="1" help="Automatically enabled when a delivery product is configured"/>
|
||||
<field name="delivery_product_id" help="Product to use for home delivery. Setting this enables home delivery."/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="Calculated Dates" name="calculated_dates">
|
||||
|
|
|
|||
|
|
@ -129,14 +129,10 @@
|
|||
<span class="meta-value">
|
||||
<t t-foreach="order.pickup_slot_ids" t-as="slot">
|
||||
<div class="slot-entry">
|
||||
<t t-if="slot.label">
|
||||
<t t-esc="slot.label" />
|
||||
</t>
|
||||
<t t-else="">
|
||||
<t t-esc="day_names[int(slot.weekday) % 7]" />
|
||||
 
|
||||
<t t-esc="('%02d:%02d-%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
|
||||
</t>
|
||||
<t t-esc="day_names[int(slot.weekday) % 7]" />
|
||||
 
|
||||
<t t-esc="('%02d:%02d–%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
|
||||
<t t-if="slot.label"> (<t t-esc="slot.label" />)</t>
|
||||
</div>
|
||||
</t>
|
||||
</span>
|
||||
|
|
@ -216,14 +212,10 @@
|
|||
<span class="info-value">
|
||||
<t t-foreach="group_order.pickup_slot_ids" t-as="slot">
|
||||
<div>
|
||||
<t t-if="slot.label">
|
||||
<t t-esc="slot.label" />
|
||||
</t>
|
||||
<t t-else="">
|
||||
<t t-esc="day_names[int(slot.weekday) % 7]" />
|
||||
 
|
||||
<t t-esc="('%02d:%02d-%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
|
||||
</t>
|
||||
<t t-esc="day_names[int(slot.weekday) % 7]" />
|
||||
 
|
||||
<t t-esc="('%02d:%02d–%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
|
||||
<t t-if="slot.label"> (<t t-esc="slot.label" />)</t>
|
||||
</div>
|
||||
</t>
|
||||
</span>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue