Konrad
8e0c0392d9
Merge pull request #12991 from murjax/remove-sku-11973
...
Remove product SKU from product pages and report
2025-01-07 21:14:39 +01:00
Rachel Arnould
1147976069
Merge pull request #13011 from drummer83/ConnApps
...
Make Connected Apps links available in Transifex
2025-01-07 15:31:46 +01:00
Konrad
7e3baabd23
Merge pull request #12983 from saunmanoj888/12957-hide-search-filter-for-no-products
...
Back Office Product List - Hide search field and filters when there are no products in list
2025-01-07 00:16:59 +01:00
Gaetan Craig-Riou
8e46c0f897
Apply changes from https://github.com/openfoodfoundation/openfoodnetwork/pull/13016
2024-12-11 10:04:57 +11:00
Maikel Linke
4be4c7622b
Clean up Haml
2024-12-10 15:32:09 +11:00
Maikel
de938f6f10
Merge pull request #12949 from rioug/12859-use-VINE-voucher
...
[City OFN Voucher] A shopper can use a VINE voucher
2024-12-03 14:04:44 +11:00
drummer83
53d2166579
Make Connected Apps links available in Transifex
2024-12-01 23:55:26 +01:00
Filipe
58d174fad9
Merge pull request #12969 from chahmedejaz/task/12919-remove-empty-option-from-unit-scale-dropdown
...
[Products] Empty option on unit scale dropdown
2024-11-28 09:31:42 -06:00
Gaetan Craig-Riou
d413a142c9
Update various voucher related file to use the new Vouchers::Vine
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
7726c7d129
Per review, rename not_vine scope to local
...
- use IS DISTINCT FROM instead of two conditions
- added spec for scope
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
6251814152
Hide VINE voucher from admin voucher page
2024-11-28 13:35:01 +01:00
saunmanoj888
87d7f73ba9
Hide search filters when no product is present
2024-11-22 00:15:08 +05:30
Ryan Murphy
bab7756017
Remove product SKU from product pages and report
2024-11-20 19:12:29 -05:00
Ahmed Ejaz
77f9c6587c
fix specs
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
add973f1ff
12776: add new line
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
7cb28fd064
12776: add supplier report
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
bafb881c46
12919: add unit scale prompt
2024-11-10 14:57:45 +05:00
Maikel Linke
2b8487cc6d
Parse given datetime for reports properly
2024-10-17 15:08:02 +11:00
Maikel Linke
ea8e925077
Show default date range to user in date picker
2024-10-17 13:16:12 +11:00
Maikel Linke
a13e5ced3d
Select default dates for Packing report, too
2024-10-17 13:16:12 +11:00
Maikel Linke
aa7fffa5a2
Filter reports by last 3 months by default
...
The values are not shown on the screen and the user doesn't know which
default dates are applied but the filtering works.
2024-10-17 13:16:12 +11:00
Filipe
97b6289263
Merge pull request #12787 from rioug/move-variant-unit-attributes-to-variant
...
[Product Refactor] Move variant unit sizes to variant
2024-10-15 19:58:45 +01:00
Rachel Arnould
f54552f939
Merge pull request #12886 from rioug/12855-VINE-connected-app
...
[Citi OFN Voucher] Add VINE connected app
2024-10-14 15:32:09 +02:00
Gaetan Craig-Riou
0695b434a2
Fix rebase issue
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
4ad6971121
Fix Bulk product edit system spec after rebase
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
768825d689
Fix Bulk Edit product part 2
...
Note, the empty entry for unit scale need a css fix , currently showing
at half height
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
e8234ee4a0
Fix Bulk products edit page , part 1
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
5b8e0d734f
Use Spree::Money to display prices
...
This is to ensure the correct currency and currency configuration is
applied.
2024-10-09 11:02:24 +11:00
Gaetan Craig-Riou
b14a1e72f3
Handle api secret
...
The VINE Api require a secret and an API key to be used. The secret is
used to sign the request. The secret is linked to the API key so we need
to store it along side the key.
2024-10-07 15:09:58 +11:00
Cillian O'Ruanaidh
f474afaceb
Merge in latest :master and resolve conflict in app/models/enterprise.rb
2024-09-27 10:11:26 +01:00
wandji20
37ab832b86
Remove window unload event listener from edit order cycle cancel link
2024-09-27 10:02:49 +02:00
wandji20
a11873559b
Make OC edit warning modal cancel button redirect user to OC list [OFN-12774]
2024-09-27 10:02:49 +02:00
Gaetan Craig-Riou
0824430da5
Add Vine connected app
...
The connection/disconnection logic is yet to be implemented
2024-09-24 10:43:55 +10:00
Filipe
83ab9594f6
Merge pull request #12854 from chahmedejaz/task/11200-conditionally-hide-producer-column
...
[BUU2] Hide producer column when there's only one producer in the admin account
2024-09-19 15:42:15 -06:00
Gaetan Craig-Riou
3f6aaa74cc
Remove duplicated styling for tabs
...
It uses the same styling as #admin now share via mixins
2024-09-13 14:14:30 +10:00
Gaetan Craig-Riou
7e84d41e8c
Simplify modal opening by just rendering the modal in turbo stream
2024-09-11 14:20:41 +10:00
Ahmed Ejaz
f8d3467d46
11200: add specs
2024-09-11 01:59:43 +05:00
Ahmed Ejaz
1580d539df
11200: coniditonally hide producer column
2024-09-11 00:56:52 +05:00
Gaetan Craig-Riou
379e5acfe5
Fix product preview modal opening
...
The previous solution failed to take into account that it would have been
trigger on any turbo steam rendering action, not just the product preview
one. Now the open event is dispatched when the product preview
controller is connected, which happens when the modal html is rendered.
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
5bf6bdf7f0
Fix some display issue with long description
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
8de7c304fe
Add AdminTooltipComponent
...
I left the stimulus controller separated as it is generic enough
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
b6695ba9a2
Add product preview on product edit page
...
Plus translation
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
e8de76dc46
Add style for Shop
...
As before, move imported css to partials to avoid duplication. And use
mixin and variable to handle tooltip styling
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
d56ab9257b
Add tab switch and shop tab
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
f24a4edc68
Add product detail to the modal
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
27dd5def57
Open modal before rendering the received html
...
This way we don't see a blank modal waiting for the content to load
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
561f4648d2
Improve tooltip partial
...
Set up default value optiona locals variable
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
64d3091db9
Add product preview modal
...
Plus open modal when clicking on "preview" link.
It's using event to communicate between stimulus controller :
https://stimulus.hotwired.dev/reference/controllers#cross-controller-coordination-with-events
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
4756ab47c2
Wire preview link via turbo-stream
2024-09-10 13:29:39 +10:00
Konrad
ae993784d8
Merge pull request #12813 from chahmedejaz/task/12810-increase-price-column-width
...
[BUU] Fix the too Narrow Price field
2024-08-29 15:22:27 +02:00