raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,494 Commits 19 Branches 453 Tags
5e7e120fcb3db1ecdfa66c3845726d34636ca27d
Commit Graph

31494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
5e7e120fcb Addresses Gaetans review 
Removes assertions from before block, as Delete case is tested elsewhere

Declares enterprise_user variable as a non-instance variable
 2024-06-17 14:56:23 +02:00
filipefurtad0
2eb1bc4d0a reverts changes on products_spec 2024-06-17 14:56:23 +02:00
filipefurtad0
04cb6b40be Adds tests around managing rights -> 'as an enterprise manager' 2024-06-17 14:56:23 +02:00
filipefurtad0
ee15be3aac Adds a test to assure that the new product path works as expected 
The funcitonaliy itself should not be affected by BUU, so the tests remain at ./spec/system/admin/products_spec.rb
 2024-06-17 14:56:23 +02:00
filipefurtad0
11365dc9a5 Removes comment on issue #7180, now closed 2024-06-17 14:56:23 +02:00
filipefurtad0
a70e6af7ac Removes deleting and cloning test from the legacy bulk product edit page 
These are covered in the new BUU products page
 2024-06-17 14:56:23 +02:00
filipefurtad0
c06ac4ca4d Removes test case on access rights to the products page 
Moves test on access rights to authentication_spec

The test on accessing the products page as an anonymous does not seem specific to the products page (IMO); as we're testing access rights and the Devise gem (right?) we're probably better off having this test in a more suitable and general context, such as as a spec dealing with authentications and redirects
 2024-06-17 14:56:23 +02:00
filipefurtad0
514117865e Adds test case around shipped product 
Removes test case around shipped product for legacy products page
 2024-06-17 14:56:23 +02:00
Maikel Linke
9298c42f99 Update all locales with the latest Transifex translations 2024-06-17 14:56:23 +02:00
Maikel Linke
f0ccfb1f91 Avoid flakiness with Capybara features 
Capybara should be clever enought to scroll to an element. The old
method failed nine times in CI. I couldn't reproduce it locally but
let's see if this is better.
 2024-06-17 14:56:23 +02:00
Filipe
03c5a9b4cc Revert "[Invoices] Notify if any order cannot be invoiced on bulk invoice sending" 2024-06-17 14:56:23 +02:00
cyrillefr
0beda91541 Requested changes on spec 
- if possible no sleep in spec
 2024-06-17 14:56:23 +02:00
cyrillefr
fb712be430 Update and Recalculate Fees after Order Adjusted in Backend 
- when update on adjustment in payment, recalculation of
  correct adjustment was not done
- the corresponding spec
- an id to easy the finding of the change of fees in the spec
 2024-06-17 14:56:23 +02:00
Maikel Linke
56398d4d0f Update stock levels of on-demand items 
We weren't bothering with stock when items were on demand anyway. But we
want to track stock now so that we can backorder more when local stock
levels become negative.
 2024-06-17 14:56:23 +02:00
Maikel Linke
36e6d96e17 Remove validation of positive stock when on demand 
We weren't allowing negative stock to stop any bug from accidentally
drawing too much stock. But now we want to implement a backordering
logic that depends on negative stock levels to know how much is needed
to replenish stock levels.
 2024-06-17 14:56:23 +02:00
Maikel Linke
29adbcb479 Import products from the FDC (Shopify) API 2024-06-17 14:56:23 +02:00
Maikel Linke
1807bc1788 Handle string values for variant unit value 
The FDC API is returning all values as strings. This should probably be
handled in the Connector long-term.
 2024-06-17 14:56:23 +02:00
Maikel Linke
7e39917a07 Add service to access FDC API 
The current implementation of the FDC is not adhering to the DFC
standard. The difference is added in this compatibility layer.

This should be temporary code. The FDC dev team should change their API
in their next development cycle.
 2024-06-17 14:56:23 +02:00
Maikel Linke
e631f848a9 Enable POSTing DFC data 2024-06-17 14:56:23 +02:00
Maikel Linke
90059b9675 Simplify DFC request retry logic 
Big thanks to David Cook for a much better pattern.
 2024-06-17 14:56:23 +02:00
Abdellani
4a434873bc update tests 2024-06-17 14:56:23 +02:00
Mohamed ABDELLANI
1f74f68f20 fix linter issue 2024-06-17 14:56:23 +02:00
Mohamed ABDELLANI
8d623d231a notify if any distributors doesn't have an abn 2024-06-17 14:56:23 +02:00
Maikel Linke
0cc31d4915 Update Rubocop todo list 2024-06-17 14:56:23 +02:00
zanetagebka
fecc8046f7 - Refactor method to fix StringConcatenation cop 2024-06-17 14:56:23 +02:00
zanetagebka
053076e062 Fix test 2024-06-17 14:56:23 +02:00
zanetagebka
028686eea4 Fix cops StringConcatenation 2024-06-17 14:56:23 +02:00
cyrillefr
bad217261b Fixes rubocop offenses on Spree::Order model 
- removes old Rails 5 flag to not validating
belongs to association. Therefore optional fields must be marked so.
 2024-06-17 14:56:23 +02:00
Maikel Linke
5925b023b3 Style/SendWithLiteralMethodName 
Use method call directly instead of `public_send` with fixed argument.

The cop is declared unsafe. I think that is because it can also replace
`send` but we replace only `public_send` here.
 2024-06-17 14:56:23 +02:00
Maikel Linke
8b4759ee05 Style/SuperArguments 
Call super without arguments and parentheses when the signature is identical.
 2024-06-17 14:56:23 +02:00
dependabot[bot]
fae93367bc chore(deps-dev): bump rubocop from 1.63.5 to 1.64.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.5 to 1.64.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.63.5...v1.64.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-17 14:56:23 +02:00
Maikel Linke
8d1397d77b Update all locales with the latest Transifex translations 2024-06-17 14:56:23 +02:00
cyrillefr
38dbe6ebc5 Increasing the placeholder size 2024-06-17 14:56:23 +02:00
cyrillefr
2ab61c423e Bugfix on spec 2024-06-17 14:56:23 +02:00
cyrillefr
4082511ed7 Add Time in flatpickr control 2024-06-17 14:56:23 +02:00
cyrillefr
40128d7311 Force start date before end date with range mode flatpickr 
- modify view to get a flatpickr component in range mode
  - modify spec to take into account range mode
 2024-06-17 14:56:23 +02:00
Abdul Aziz Ali
ca516f7cef Define tax_on_fees i8n key #11680 2024-06-17 14:56:23 +02:00
Abdul Aziz Ali
5fb1c0798d Display additional tax total in order #11680 
Add new text key admin.order.edit.additional_tax_included_in_price
Add spec file for additional tax display. Add new trait for enterprise fee and calculator factory
 2024-06-17 14:56:23 +02:00
David Cook
0796a83f1e Update comment 
[skip ci]
 2024-06-17 14:56:23 +02:00
David Cook
2a4d0db0de Remove unused method 2024-06-17 14:56:23 +02:00
David Cook
f97241dce3 Detect changes in price 
Price is actually an association with lots of custom methods to make it look like a field, and so changes were ignored.
Now this issue is fixed, perhaps it should be moved to a concern..

Note, there are other delegated fields: product name and description may be assigned from the variant. But there's no hooks to save the prroduct, so I didn't include it when checking for changes.
 2024-06-17 14:56:23 +02:00
David Cook
18ed034e31 Remove duplicate assign 2024-06-17 14:56:23 +02:00
isidzukuri
ba1133ad44 Do not commit to db unchanged products is bulk save 2024-06-17 14:56:23 +02:00
David Cook
0b3246b01c Add comment 2024-06-17 14:56:23 +02:00
Ana Nunes da Silva
442fe8c956 Add div to sanitizer supported tags 2024-06-17 14:56:23 +02:00
Ana Nunes da Silva
cbee263222 Add safe trix tags to html sanitizer; 
Use custom html sanitizer in product description.
 2024-06-17 14:56:23 +02:00
Ana Nunes da Silva
4dfddd4801 Sanitize product description using rails default sanitizer 2024-06-17 14:56:23 +02:00
dependabot[bot]
54452893d5 chore(deps): bump leaflet-geosearch from 3.11.1 to 4.0.0 
Bumps [leaflet-geosearch](https://github.com/smeijer/leaflet-geosearch) from 3.11.1 to 4.0.0.
- [Release notes](https://github.com/smeijer/leaflet-geosearch/releases)
- [Commits](https://github.com/smeijer/leaflet-geosearch/compare/v3.11.1...v4.0.0)

---
updated-dependencies:
- dependency-name: leaflet-geosearch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-17 14:56:22 +02:00
Ahmed Ejaz
d08039e498 12398: add lazylookup for translations 2024-06-17 14:56:22 +02:00
Ahmed Ejaz
d30951b64d 12398: fix lint issues 2024-06-17 14:56:22 +02:00