raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

150 Commits

Author SHA1 Message Date
Maikel
014fb69d4b Merge pull request #10964 from macanudo527/fix_linelength_bundle1 
Fix Layout/LineLength - Bundle 1
 2023-06-26 12:10:39 +10:00
Neal Chambers
1e4034534c Fix Layout/LineLength 2023-06-23 09:08:04 +09:00
Matt-Yorkley
1daab8994d Remove is_master and not_master scopes 2023-06-16 21:23:44 +01:00
Konrad
48c107bde1 Merge pull request #10974 from cillian/ignore-whitespace-in-product-import 
Ignore leading and trailing whitespace when importing products via a spreadsheet
 2023-06-12 16:32:15 +02:00
Cillian O'Ruanaidh
5cde4de512 Ignore leading and trailing whitespace in spreadsheet when importing products 2023-06-09 16:23:18 +01:00
Neal Chambers
a35a07b441 Rewrite sum to be more Readable 2023-06-09 16:39:29 +09:00
Maikel Linke
1cbb45a618 Style Lint/RedundantSafeNavigation 
The cop suggested to change more but they were false positives:

* https://github.com/rubocop/rubocop/pull/11915
 2023-06-05 12:09:32 +10:00
Filipe
3e0b358370 Merge pull request #10461 from vviekk/9978 
Updating price, on_hand, on_demand validations for product import
 2023-04-19 16:09:49 +01:00
Neal Chambers
940f806e5f Fix Rubocop Layout/LineLength 2023-04-04 09:44:15 +09:00
vviekk
54d5d0ed80 Accepting 0<unit values<1 in product import validations 2023-03-16 16:26:43 +05:30
vviekk
e10ea4b686 Merge branch 'openfoodfoundation:master' into 9978 2023-03-11 11:00:03 +05:30
Jean-Baptiste Bellet
7b8ccccdc3 display_name can actually be null or empty: consider them as equal 2023-03-02 17:15:57 +01:00
vviekk
913f8bbad0 Addressing comments 2023-02-26 15:50:34 +05:30
vviekk
fc951e92ac Updating price, on_hand, on_demand validations for product import 2023-02-18 13:52:35 +05:30
ijdershem-jf
18e9aba6b8 [OFN-9870] Display accurate error message for differing variant_unit_name for same product in import 2022-12-20 08:19:47 -07:00
Konrad
c44195c8a0 Merge pull request #9911 from viniciusueharaweb/9781-improve-shipping-category-not-found-error-message 
[Product Import] Wrong error message when shipping category does not match predefined shipping categories
 2022-11-10 22:48:25 +01:00
Mohamed ABDELLANI
70e47f3929 fix: convert @attrs[:units] to big decimal instead of float in the unit converter 2022-11-08 10:26:00 +01:00
Vinicius Uehara
f6cc9fca26 Prioritize attribute errors over product validations 
With product validations being prioritized, custom and
insightful error messages were being overwriten by
general and ambiguous model validations, which
were confusing users
 2022-10-30 20:02:08 -03:00
Vinicius Uehara
1f498e6052 Improve shipping category not found error message 2022-10-30 20:02:05 -03:00
SarvarKhalimov
d69f42e940 Update app/models/product_import/entry_validator.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2022-02-15 00:10:32 +05:00
SarvarKhalimov
42a0a973ba Fix product import on existing, empty unit_type and variant_unit 2022-02-13 18:28:21 +05:00
Tsara Sudrajat
56ac2e4e61 Convert product headings to load from translation 2022-01-21 18:30:38 +07:00
Matt-Yorkley
1d5077061e Remove andand 
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
 2021-09-08 14:28:31 +01:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Cillian O'Ruanaidh
89d63dfbb9 When resetting stock to 0 on absent products in inventory import also reset the on demand setting 
Before when you imported inventory and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant override was also set to be on demand the inventory would still be available for sale. This change makes sure the on demand setting is turned off too.

Fixes #6289.
 2020-11-06 14:57:31 +00:00
Andy Brett
4f942db0ba convert entry's unscaled_units to a float 
This was coming in as a string, e.g. "1", so when we did "1" * 1000 it returned "11111111111111....." :)
 2020-09-25 09:12:19 -07:00
Andy Brett
d1a87f7ba0 add oz and lb as allowed units in product import 2020-09-17 06:34:07 -07:00
Andy Brett
55e448897f use fewer sigfigs for ounces; add spec to option_value_namer 2020-09-03 09:11:00 -07:00
Andy Brett
e99799bca2 add ounces and round up for lbs 2020-09-03 09:11:00 -07:00
Zee Spencer
cb09c935dc WIP: Products may be created with pounds for their weight unit_converter 
See: https://community.openfoodnetwork.org/t/hubs-managers-can-choose-the-adapted-weight-and-measure-units-for-their-shops-given-their-own-local-situation/1289/11

We're not entirely sure what needs to be changed in order for this to
accurately work with shipping and other parts of the eCommerce platform.

We are assuming that so long as we canonically store the weight scale
in grams, that the shipping calculation will be able to do what it needs
to. So if we put in values for "oz" as grams, we may not need to do
much else in order to let product(s) be sold by the pound (or ounce).

Next steps appear to be:

- [ ] When looking at an order as a customer, do we want to show pounds
      instead of grams? (See: http://localhost:3000/orders/R125684626)
- [ ] Compile a list of tests that are worth writing (because we have
      no confidence that we know what we are supposed to be doing in
      order for this feature to be "ready" to be used by people.)
- [ ] Write a test that demonstrates when we create a product with a
      variant in pound that the product's shipping weight is correctly
      calculated?
- [ ] Do we want to think about i18n?
 2020-09-03 09:10:59 -07:00
Luis Ramos
b49eef5fa9 Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
ff68303ef6 Fix long lines 2020-06-22 17:39:20 +01:00
Luis Ramos
0f2e07cc2d Fix long lines 2020-06-22 17:39:20 +01:00
Luis Ramos
b879439d58 Use rubocop auto correct to fix Style/SafeNavigation issue 2020-06-22 16:51:46 +01:00
Luis Ramos
06a37d8ff0 Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed 
Add handling of CSV::MalformedCSVError for product_importer
 2020-06-17 19:58:35 +01:00
Pau Perez
456f369b76 Fix outstanding Rubocop violations 2020-06-15 10:17:34 +02:00
Gaetan Riou
d3943bc92a refactor error handling of CSV::MalformedCSVError and fix some typos 2020-06-11 16:47:58 +10:00
Gaetan Riou
9b8a97aadd Add handling of CSV::MalformedCSVError for product_importer 2020-06-08 16:21:02 +10:00
Luis Ramos
c6842ada7f Add variant_unit_name to the list of fields to be ignored when creating a variant, it's a product field 2020-06-01 13:41:15 +01:00
Luis Ramos
1c628fac58 Merge branch 'master' into 3-0-stable-mar20 2020-03-20 11:28:06 +00:00
Luis Ramos
bae9df8214 Merge pull request #4787 from luisramos0/catalog_domain 
Add new domain/engine Catalog
 2020-03-16 18:47:55 +00:00
Luis Ramos
8c367a2ed2 Merge branch 'master' into 3-0-stable-mar6 2020-03-09 13:20:19 +00:00
Matt-Yorkley
5c526bf5cc Move definitions into constants and use #freeze 2020-02-28 13:08:17 +01:00
Matt-Yorkley
a9e6622639 Update product import #assign_attributes calls 
For some reason some of the superfluous attributes being assigned here have started throwing fatal errors in Rails 4 instead of being silently ignored...
 2020-02-28 13:08:17 +01:00
Matt-Yorkley
38215c2a88 Delete some dead code 
This feature for assigning defaults via the UI was previously removed
 2020-02-27 19:28:25 +01:00
Luis Ramos
00e57c8a55 Add module definition in the recently moved service and adapt all it's usages to refer to the new namespace 2020-02-13 20:17:09 +00:00
Luis Ramos
2e74e64e22 Move Product Reset Strategy to the catalog domain 2020-02-13 20:17:09 +00:00
Matt-Yorkley
103902c006 Replace deprecated arguments in #find_by 
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')

       ActiveRecord::StatementInvalid:
         PG::UndefinedColumn: ERROR:  column enterprises.select does not exist
         LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
         : SELECT  "enterprises".* FROM "enterprises"  WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
       # ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
       # ./app/models/product_import/spreadsheet_data.rb:43:in `each'
 2020-01-15 16:39:33 +01:00