raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 20 Branches 451 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

77 Commits

Author SHA1 Message Date
Jordan 'sloth' Mock
b56411145c Incorrect place for origianl fix. Thanks to Blane W for pointint out the correct line. 2025-04-24 13:05:40 +01:00
David Cook
5a1190cdda Remove superfluous %div from haml elements with class 
Div is the default element in HAML, so we don't need to specify it. https://haml.info/docs/yardoc/file.REFERENCE.html#implicit-div-elements
 2025-03-03 14:46:24 +01:00
cyrillefr
49c6a22fde Replace product by variant to see producer name on views 
- replace product by variant since there had been changes in
  product & variant models.
- add a line in spec to test producer name.
 2024-07-11 13:41:49 +02:00
Gaetan Craig-Riou
b156f722f1 Fix variant override spec 2024-07-03 11:15:10 +10:00
Maikel Linke
ba51641271 Symbolise hash keys in HAML files 
This was done by the haml-up script.
 2024-02-22 15:01:14 +11:00
Maikel Linke
c097f2b622 Upgrade HAML syntax with script 2024-02-22 15:01:13 +11:00
Neal Chambers
4feb8f922e Fix Rails/HelperInstanceVariable in injection_helper.rb 2023-09-01 11:03:26 +09:00
Cillian O'Ruanaidh
d90d352a86 Remove unused showMore angular directive 2022-12-16 12:55:28 +00:00
Filipe
998f7afdc4 Merge pull request #8523 from seballot/progress-for-ajax-request 
Improve loading spinner display
 2022-02-01 10:03:04 +00:00
Deepak Chauhan
7adc1186c6 removed transaltion or between buttons from multiple views 2022-01-19 03:16:55 +05:30
Sebastian Castro
115dfe445b loading-message: make them all look the same in admin 
use font awesome spinner instead of an image
 2022-01-11 21:55:07 +01:00
Maikel Linke
0980b81742 Raise errors in specs with missing translations 
The previous mechanism didn't seem to work and newer Rails versions have
an easier config for this now.

Also fixing all i18n errors which were now failing specs.
 2021-03-30 17:08:17 +11:00
Matt-Yorkley
f72cd6222f Adjust variant columns in inventory pages 2021-01-27 11:38:01 +00:00
Jean-Baptiste Bellet
8399b82bfd rename component to spinner 
A name for a "thing" rather a state
 2021-01-11 16:49:56 +01:00
Jean-Baptiste Bellet
b02b36b8e8 replace code by reusable component 2021-01-11 11:18:34 +01:00
Matt-Yorkley
add38bf550 Use #image_path helper correctly 
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
 2020-06-16 18:25:13 +02:00
Eduardo
64d83bfc4d fix ampersand problem using ng-bind-html 2020-03-01 17:54:36 -03:00
Luis Ramos
9c3c74aa93 Merge pull request #4394 from luisramos0/fix_product_sub_menu 
Merge duplicated product_sub_menu partials
 2019-10-31 12:48:27 +00:00
luisramos0
6715f872e3 Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial 2019-10-23 12:26:18 +01:00
luisramos0
3372339907 Fix default stock translation by using t filter instead of t function 2019-10-22 17:29:04 +01:00
Andrew
deb17f47a7 Add default_stock to en.yml and _products_variants 2019-10-19 16:33:31 -07:00
Andrew
598426a5e9 Add Save Changes button translation 2019-10-18 22:18:54 -07:00
Matt-Yorkley
668a37f564 Fix "clear all" button spacing in inventory 2019-04-01 12:18:19 +01:00
luisramos0
b325cea6cb Merge branch 'master' into 2-0-stable-Mar6 2019-03-06 09:19:53 +00:00
Matt-Yorkley
25e2d2adda Update references to product_sub_menu view 2019-02-26 20:06:01 +00:00
luisramos0
e28f9a7c84 Merge branch 'master' into 2-0-stable-jan-8th 2019-01-08 14:29:50 +00:00
Kristina Lim
842a8e3654 Move null option for VO use_producer_settings to JS 2018-12-05 17:40:32 +08:00
Kristina Lim
cff4eb0005 Improve and simplify VO count on hand suggestions 
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
 2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763 Use correct placeholders for VO count_on_hand 2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7 Make VO count on hand readonly unless limited stock 2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5 Ensure in UI compatible VO count and on demand 2018-12-05 17:40:28 +08:00
Kristina Lim
4b3198a2b4 Allow reset of "on demand" for variant overrides 
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.

This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
 2018-12-05 17:40:24 +08:00
luisramos0
7f7e7ea65e Remove hide class from the hide button in the inventory list 
The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it
 2018-12-04 10:55:55 +00:00
Matt-Yorkley
ffbb67d480 PI inventories additions 2018-05-26 19:34:19 +01:00
Matt-Yorkley
4e97445655 PI inventories timestamps 2018-05-26 19:34:19 +01:00
Rob Harrington
88563431b8 Module arguments passed to injection functions in consistent way 2018-02-09 14:43:36 +11:00
Julius Pabrinkis
ef488133e8 Add missing translations from files list. 2017-07-21 12:17:12 +10:00
François Turbelin
01746ed470 Add missing translations on views 2017-05-04 21:33:17 +02:00
François Turbelin
88dea0f2b8 Adding i18n keys on Admin side (Rails views) 2017-01-11 10:00:06 +11:00
Rob Harrington
3f8420b0e9 Adding tags to variant overrides 2016-05-27 16:23:26 +10:00
Rob Harrington
924d155012 Using correct syntax for attributes on columns 2016-05-25 08:10:20 +10:00
Rob Harrington
b9f6cb8800 Adding translations for all column names 2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474 Default column visibility can be set per user using ColumnPreferences model 2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a Refactoring save-bar 2016-05-25 08:10:20 +10:00
Rob Harrington
564c1a3650 Improvements to customers page 
Create customer from dialog

Limiting the number of products shown as once

Adding SaveBar and StatusMessage
 2016-05-25 08:10:20 +10:00
Rob Harrington
1d837c32ee Replacing bindonce with native Angularjs syntax in admin 2016-05-25 08:10:20 +10:00
Bing Xie
f8ec0d316a Save bar can support cancel button 2016-05-12 11:04:40 +10:00
Bing Xie
78b4a35d12 Keep the action with save button 2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7 Use save_bar on order cycle update form 2016-05-12 10:45:41 +10:00
Rob Harrington
44077a2c6f Fixing styling (bottom margin for save-bar) on inventory page 2016-04-06 15:43:55 +10:00