raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,557 Commits 18 Branches 451 Tags
a8b5a79b4b36bc715c201ff1e1155152ee2e3382
Commit Graph

4073 Commits

Author SHA1 Message Date
cyrillefr
2dce79a93d Fixes Rubocop HeredocDelimiterNaming offense 2025-04-28 09:47:55 +02:00
cyrillefr
7812d5f58a Replace set_methods in order model 2025-04-24 09:29:40 +02:00
Filipe
07842bf5eb Merge pull request #13081 from pacodelaluna/do-not-allow-spaces-in-external-billing-id 
Do not allow spaces in external billing
 2025-04-23 12:20:02 +01:00
Filipe
d2fa2e612c Merge pull request #13113 from chahmedejaz/task/13031-allow-producers-to-edit-orders 
Allow producer to edit their products on hubs' orders
 2025-04-21 11:28:36 +01:00
Filipe
cb9db54cd3 Merge pull request #13240 from rioug/13100-do-not-remove-fee-product-removed-from-OC 
[Enterprise Fees] Keep fees on product when a product is removed from the order cycle
 2025-04-20 21:57:56 +01:00
Ahmed Ejaz
213209b460 hide customer info on bulk orders page 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
293b30cfa6 simplify block 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
f2adcbf2b8 fix syntax error 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0500294480 rename is_producer to is_producer_only 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
f132d99df4 remove ids usage 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
ccfd0edbf1 fix lint issues 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
3e71f8293c add bulk_management ability 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
19c5fec9a9 add ability update supplier line_items in orders 2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0a61910cf6 add ability to view supplier products containing orders 2025-04-13 21:35:55 +05:00
François Turbelin
9529acd477 Adjust the regexp 2025-04-09 23:23:37 +02:00
François Turbelin
243d81c786 Revert "Improve the no-white-spaces regexp for enterprises" 
This reverts commit baf89053638628052752f345b357d630d7484046.
 2025-04-09 23:20:51 +02:00
François Turbelin
98251b306e Improve the no-white-spaces regexp for enterprises 2025-04-09 22:34:25 +02:00
Gaetan Craig-Riou
6d78ee8be4 Fix rubocop warning 2025-04-09 22:34:23 +02:00
cyrillefr
019c703b1c Fix Rubocop InverseOf offense in Order 
- also fix failing spec due to adding inverse
 2025-04-03 12:39:06 +02:00
Gaetan Craig-Riou
1279ab21a6 Fix delete fee logic 
A fee can be associated to both the incoming and outgoing exchange, the
previous logic did not account for that, resulting in the fee not being
correctly removed.
Now the delete logic also check for the metadata enterprise role to see
if any additional fee need to be removed.
 2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
b5bc6b84d7 Update Orders::HandleFeesService#recreate_all_fees! 
We now update or create line item fees instead of deleting them and
recreating them. This is to cover the case when a product has been
removed from an Order Cycle but we want to keep the fee already applied
on existing order. This was an issue only if the existing order got
updated after the product was removed.
 2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
2a0caca570 Refactor EnterpriseFee.clear_all_adjustments 
Renamed to clear_order_adjustments, it doesn't clear line item
adjustment
 2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
0537a56b47 Merge pull request #13239 from cyrillefr/FixRailsRubocopIssueInverseOfInPayments 
Fixes rubocop offense inverse_of on payment model
 2025-04-01 09:59:01 +11:00
David Cook
d8eab7875f Merge pull request #13235 from mkllnk/stock-aggregation 
[API change] Remove unused ProductStock concern
 2025-04-01 09:45:24 +11:00
cyrillefr
09a6da0c57 Fixes rubocop offense inverse_of on payment model 
- some clean up unused method too
 2025-03-31 17:10:43 +02:00
Maikel Linke
b3ddfde1c3 Remove empty ProductStock concern 2025-03-28 14:49:47 +11:00
Maikel Linke
ca9f32ceae [API change] Remove unused Product#on_hand 2025-03-28 14:48:40 +11:00
Maikel Linke
d55d4dd8ed Remove unused Product#on_demand 2025-03-28 14:00:40 +11:00
cyrillefr
da26f5833f Requested changes 2025-03-26 19:44:08 +01:00
cyrillefr
1d24674386 Fixes some Rails InverseOf offenses 2025-03-25 18:46:00 +01:00
cyrillefr
fa4fc7c3c5 Fixes Rails TimeZone rubocop offenses 2025-03-21 13:13:52 +01:00
Gaetan Craig-Riou
11e08dcc26 Revert "Update line items enterprise fee instead of deleting and recreating " 2025-03-19 09:40:02 +11:00
Filipe
b3c7968e50 Merge pull request #13144 from rioug/13100-removed-fee-when-product-removed 
Update line items enterprise fee instead of deleting and recreating
 2025-03-14 10:12:50 +00:00
cyrillefr
9bb617d748 Fixes some rubocop linting offenses - part III 2025-03-06 23:42:53 +01:00
Maikel
2e4b59daaf Remove orphaned comment 2025-03-06 11:28:25 +11:00
David Cook
633cdaca56 Remove unused method 
I believe it's unused since e4d307fe5e
 2025-03-06 09:49:50 +11:00
cyrillefr
446b948889 Fixes some rubocop linting offenses - part II 2025-03-03 14:03:47 +01:00
cyrillefr
027d4ccbad Fixes some rubocop linting offenses - part I 
- Lint/RedundantSafeNavigation
- Lint/SelfAssignment
- Lint/UselessMethodDefinition
 2025-02-27 16:28:00 +01:00
Gaetan Craig-Riou
46315c4045 Update Orders::HandleFeesService#recreate_all_fees! 
We now update or create line item fees instead of deleting them and
recreating them. This is to cover the case when a product has been
removed from an Order Cycle but we want to keep the fee already applied
on existing order. This was an issue only if the existing order got
updated after the product was removed.
 2025-02-19 15:13:26 +11:00
Maikel Linke
516759062f Import variants for the same product group 
When importing another catalog, it's probably referring to external
product groups. Storing the external link allows us to group several
variants and replicate the same structure within OFN.
 2025-02-18 13:08:48 +11:00
Filipe
e7ef5984d5 Merge pull request #13125 from dacook/dfc-product-import-list-12301 
[DFC Orders] List products to import on screen
 2025-02-13 22:34:32 -06:00
cyrillefr
0aecb6873a Requested changes 
- 2 new methods for reading either current/desired on hand/on demand
  depending on variant state. Goal is to get rid of send method in View
- referring in on_hand/on_demand is in fact irrelevant. In the piece of
  code, only desired on_hand/on_demand can be called as we are only in
  new variant (non persisted) mode
- View does not use send method anymore, replaced by current_or_desired
- refactor of the spec -> 2 examples in one to get more speed.
 2025-02-12 16:01:21 +01:00
cyrillefr
6d6164c8f6 Keep stock selection when error on saving 
- added 2 not to be persisted attributes aimed at dealing with the UI
- added them to the permitted list
- updated view to switch mode about on_hand/on_demand
  that is: from an already persisted variant or not
    - Not persisted deals with on_*_desired not to be persisted fields
    - Persisted mode deals with regular on_* fields
- the corresponding spec for both on_hand/on_demand
 2025-02-12 16:01:21 +01:00
Gaetan Craig-Riou
e87477b679 Refactor EnterpriseFee.clear_all_adjustments 
Renamed to clear_order_adjustments, it doesn't clear line item
adjustment
 2025-02-10 16:28:19 +11:00
David Cook
447ff3cffd Show list of products to import 
If there's a matching product in OFN already, a link will appear.
 2025-02-06 16:28:15 +11:00
Filipe
54fad01a91 Merge pull request #13104 from mkllnk/test-seeds 
Remove unused preference default_country_id
 2025-01-30 21:59:46 -06:00
Filipe
32c4b4557b Merge pull request #13086 from rioug/fix-tax-rate-refund 
Remove tax rate refund code path
 2025-01-30 21:54:30 -06:00
Filipe
e2161660b3 Merge pull request #13090 from mkllnk/replace-spree-roles 
Replace spree roles
 2025-01-30 21:30:56 -06:00
Maikel Linke
6885184bcc Remove unused preference default_country_id 2025-01-28 16:31:45 +11:00
David Cook
ffad3f249b Update comment 
See: https://github.com/openfoodfoundation/openfoodnetwork/blob/master/spec/system/admin/adjustments_spec.rb
 2025-01-27 11:02:50 +11:00