wutta/sideshow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: move Pricing config to separate section, for orders/configure

Browse source
This commit is contained in:
Lance Edgar 2025-01-30 15:46:02 -06:00
parent 89e3445ace
commit 7e1d68e2cf
2 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/sideshow/web/templates/orders/configure.mako
View file

@ -42,36 +42,6 @@
<h3 class="block is-size-3">Products</h3>
<div class="block" style="padding-left: 2rem;">
<b-field>
<b-checkbox name="sideshow.orders.allow_item_discounts"
v-model="simpleSettings['sideshow.orders.allow_item_discounts']"
native-value="true"
@input="settingsNeedSaved = true">
Allow per-item discounts
</b-checkbox>
</b-field>
<b-field v-show="simpleSettings['sideshow.orders.allow_item_discounts']">
<b-checkbox name="sideshow.orders.allow_item_discounts_if_on_sale"
v-model="simpleSettings['sideshow.orders.allow_item_discounts_if_on_sale']"
native-value="true"
@input="settingsNeedSaved = true">
Allow discount even if item is on sale
</b-checkbox>
</b-field>
<div v-show="simpleSettings['sideshow.orders.allow_item_discounts']"
class="level-left block">
<div class="level-item">Default item discount</div>
<div class="level-item">
<b-input name="sideshow.orders.default_item_discount"
v-model="simpleSettings['sideshow.orders.default_item_discount']"
@input="settingsNeedSaved = true"
style="width: 5rem;" />
</div>
<div class="level-item">%</div>
</div>
<b-field label="Product Source">
<b-select name="sideshow.orders.use_local_products"
v-model="simpleSettings['sideshow.orders.use_local_products']"
@ -115,6 +85,40 @@
</div>
</div>
<h3 class="block is-size-3">Pricing</h3>
<div class="block" style="padding-left: 2rem;">
<b-field>
<b-checkbox name="sideshow.orders.allow_item_discounts"
v-model="simpleSettings['sideshow.orders.allow_item_discounts']"
native-value="true"
@input="settingsNeedSaved = true">
Allow per-item discounts
</b-checkbox>
</b-field>
<b-field v-show="simpleSettings['sideshow.orders.allow_item_discounts']">
<b-checkbox name="sideshow.orders.allow_item_discounts_if_on_sale"
v-model="simpleSettings['sideshow.orders.allow_item_discounts_if_on_sale']"
native-value="true"
@input="settingsNeedSaved = true">
Allow discount even if item is on sale
</b-checkbox>
</b-field>
<div v-show="simpleSettings['sideshow.orders.allow_item_discounts']"
class="level-left block">
<div class="level-item">Default item discount</div>
<div class="level-item">
<b-input name="sideshow.orders.default_item_discount"
v-model="simpleSettings['sideshow.orders.default_item_discount']"
@input="settingsNeedSaved = true"
style="width: 5rem;" />
</div>
<div class="level-item">%</div>
</div>
</div>
<h3 class="block is-size-3">Batches</h3>
<div class="block" style="padding-left: 2rem;">

14
src/sideshow/web/views/orders.py
View file

@ -950,12 +950,6 @@ class OrderView(MasterView):
'default': 'true'},
# products
{'name': 'sideshow.orders.allow_item_discounts',
'type': bool},
{'name': 'sideshow.orders.allow_item_discounts_if_on_sale',
'type': bool},
{'name': 'sideshow.orders.default_item_discount',
'type': float},
{'name': 'sideshow.orders.use_local_products',
# nb. this is really a bool but we present as string in config UI
#'type': bool,
@ -964,6 +958,14 @@ class OrderView(MasterView):
'type': bool,
'default': True},
# pricing
{'name': 'sideshow.orders.allow_item_discounts',
'type': bool},
{'name': 'sideshow.orders.allow_item_discounts_if_on_sale',
'type': bool},
{'name': 'sideshow.orders.default_item_discount',
'type': float},
# batches
{'name': 'wutta.batch.neworder.handler.spec'},
]