raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,139 Commits 21 Branches 450 Tags
bf9cfd49901ac7a2c7bc6e14f1d76aedb8efc60d
Commit Graph

1637 Commits

Author SHA1 Message Date
Maikel Linke
cec9d2987e Name order attributes similar to other text 
Rails' auto-generated names used in error messages were a bit cryptic
for users.
 2023-01-25 15:49:44 +11:00
Filipe
996d3afe4f Merge pull request #9983 from cillian/remove-exchange-tags-n1-query 
Remove N+1 query loading tags for each order cycle exchange
 2022-12-07 17:38:41 +00:00
Sigmund Petersen
52487a270d Merge pull request #9889 from mkllnk/dfc-products 
Activate DfcProvider with feature toggle, not prod
 2022-11-16 12:26:44 +01:00
Cillian O'Ruanaidh
fbe6dcba7a Remove N+1 query loading tags for each order cycle exchange 2022-11-11 17:01:46 +00:00
Filipe
a7353eb69f Merge pull request #9575 from apricot12/9487-Dimensions-Packing-Reports 
Added HEIGHT, WEIGHT, WIDTH, DEPTH columns to packing reports by customer.
 2022-11-10 09:55:26 +00:00
Maikel Linke
56667f6142 Simplify test setup with enabled features 
If a feature is activated or not depends on the database which is reset
after each test scenario. So enabling a feature doesn't leak into other
scenarios.

Just enabling the feature is less code and more realistic than mocking a
method call.
 2022-10-27 15:32:05 +11:00
Rachel Arnould
2652bc086a Merge pull request #9755 from cillian/order-cycle-payment-methods 
Let people choose which payment methods are available to customers on order cycles
 2022-10-26 20:10:34 +02:00
Jean-Baptiste Bellet
ede38a417f Respect rubocop Metrics/AbcSize by extracting a method 2022-10-25 10:22:35 +02:00
Maikel Linke
7081e712e8 Flag style issue on todo list for later 
The code needs some bigger refactoring to avoid this style issue.
 2022-10-25 10:09:26 +02:00
Nihal Mohammed
5c0f3a2d4b Add weight, height, width, depth fields to pack by customer reports 
+ update specs by adding dimensions fields into reports specs
 2022-10-25 10:09:26 +02:00
Konrad
4a7ac45dba Merge pull request #9830 from jibees/9821-remove-report_inverse_columns_logic-feature-toggle 
Remove `report_inverse_columns_logic` feature toggle
 2022-10-25 00:23:31 +02:00
Jean-Baptiste Bellet
edc667a336 By default, some columns are hidden. 2022-10-24 11:12:22 +02:00
Maikel
627b8af37b Merge pull request #9828 from mkllnk/authorize-api-key 
Prevent users from changing API keys for others
 2022-10-24 11:22:35 +11:00
Cillian O'Ruanaidh
62cd507fb9 Stub Spree::Config.stripe_connect_enabled instead of changing it before and back after tests 
It's less code and sometimes there can be issues when config cache values are changed.

Co-authored-by: Maikel <maikel@email.org.au>
 2022-10-21 17:21:31 +01:00
jibees
48e18b016a Merge pull request #9756 from vsmay98/8249-fix-snail-for-all-shipping-method-fee 
Fix snail issue for all shipping method fees
 2022-10-20 17:31:24 +02:00
Maikel Linke
fc79612f26 Prevent users from changing API keys for others 
It was checking for the permission to create a user which everyone can
do. Now it's checking for updating that particular user and doesn't
allow generating new keys for other users any more.

This would have been an inconvenience but not a big security issue
because you can't view the key of another user.
 2022-10-20 17:56:46 +11:00
Vishal Jain
e02de2b17d Fix snail issue for all shipping method fees 2022-10-11 15:30:19 +05:30
Maikel Linke
52e934ec2b Consistently use our FeatureToggle module 
Direct calls to Flipper have the downside that we can't add any new
functionality like storing the feature in the database when used.
 2022-10-08 16:23:17 +02:00
filipefurtad0
4690cb102b Adds sets-up the cassettes correctly and other configs 
deletes unecessary files

Reverts helper option to turn VCR off
 2022-09-27 07:26:26 +01:00
Maikel Linke
bf3da0531e Correct grammar in spec description 2022-08-29 14:43:43 +10:00
Maikel Linke
3a365b6dc6 Remove useless braces 2022-08-29 14:42:11 +10:00
Maikel Linke
ee7dc821ca Correct typo in spec which lead to flakiness 
I'm not sure why this spec passed on CI when it was retried but it was
obviously wrong. Correcting that copy&paste error seems to make the spec
pass.
 2022-08-29 14:39:43 +10:00
Filipe
ae391f8af4 Merge pull request #9414 from Philwi/user-generates-api-key 
Let users view and regenerates api key
 2022-08-17 21:36:13 +01:00
Jean-Baptiste Bellet
77eec6e6f3 Check step params and redirect if step is inconsistent to order state 2022-08-15 16:13:37 +10:00
Filipe
689720b749 Merge pull request #9437 from jibees/8897-preselect-default-card-and-do-not-allow-to-charge-if-no-card-is-marked-as-default 
User account, Credit cards: Do not allow to check "Allow charges" if no credit cards marked as default
 2022-08-11 16:34:42 +01:00
Philipp Winkler
bf53a02270 Add api key toggle view checkbox 2022-08-07 09:48:49 +02:00
Filipe
dd17f98edb Merge pull request #9196 from jibees/8912-change-order-creation-form-steps-order 
Admin, Order creation: Change steps ordering
 2022-08-03 09:09:43 +01:00
Rachel Arnould
cf26c465cc Merge pull request #9390 from binarygit/feature/update-orders-table 
Feature/update orders table
 2022-08-02 10:10:03 +02:00
Jean-Baptiste Bellet
f087b7184c Update specs to reflect order steps changes 2022-07-28 09:31:42 +02:00
Jean-Baptiste Bellet
34c8748b9c Mark the next credit cards with payment profile as default 2022-07-26 14:42:55 +02:00
jibees
20ee0d5009 Merge pull request #9301 from mkllnk/3975-unsupported-image 
Allow SVG images for products and show errors when uploading unsupported file
 2022-07-21 16:56:11 +02:00
Jean-Baptiste Bellet
753a643bf1 Simplify main method by creating two private methods 
Include some unit tests
 2022-07-19 09:50:06 +10:00
binarygit
3c741f0686 Add flash after an order is cancelled 2022-07-13 18:45:43 +05:45
Filipe
6b00319e4a Merge pull request #9191 from jibees/9186-inverse-hide-columns-UX-by-a-columns-to-show 
Admin, Reports: Inverting logic from "Columns to hide" to "Columns to show"
 2022-06-21 17:34:31 +01:00
Maikel Linke
5f11b6a650 Respond with errors if image upload fails 2022-06-14 15:06:17 +10:00
Maikel Linke
6b733ad7e2 Increase readability of image controller spec 
Best viewed without whitespace changes.

- Decrease indent.
- Move `let` to top like in other specs.
- Avoid `let!` to speed up the specs.
 2022-06-14 14:56:40 +10:00
Filipe
9fee4f1554 Merge pull request #9203 from AgriculturaFamiliar/remove-closed-associated-adjustments-button 
Remove closed associated adjustments button
 2022-06-10 10:10:50 +01:00
Maikel Linke
b7efa1b018 Replace Paperclip on Spree::Image 2022-06-01 17:16:55 +10:00
Maikel Linke
4a0ed99919 Replace Paperclip on Enterprise model 
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.

Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
 2022-06-01 17:16:55 +10:00
Jean-Baptiste Bellet
c102eecb18 Introduce FeatureToggle for columns logic 
This commit is relative to 9094a65ab commit
 2022-05-31 15:57:39 +02:00
Jean-Baptiste Bellet
a46416a98e Change UX to transform from fields_to_hide to fields_to_show 
Fill `params[:fields_to_show]` with its default value
 2022-05-30 15:34:08 +02:00
Jean-Baptiste Bellet
9094a65ab6 Remove fields_to_hide as unecessary 2022-05-30 15:34:08 +02:00
Arthur Vieira
e0241b6866 Remove test associated without 'unlock' selected 
Leaves the other test that should be the default behaviour and renames
it accordingly.
 2022-05-26 10:12:39 -03:00
Sebastian Castro
56fab26235 Reports: refactor to easily provide default_params 2022-05-12 16:54:14 +02:00
Sebastian Castro
b3e1ffe9e2 Report Refactor 3: Products & Inventory 2022-05-12 16:54:14 +02:00
Sebastian Castro
93751f9ccb Report Refactor 3: Customers 2022-05-12 16:54:13 +02:00
Sebastian Castro
7a9ed7a73c Report Refactor 3: Order & Fulfilment 2022-05-12 16:54:13 +02:00
Sebastian Castro
529858946f Report Refactor 3: Packing 
Stop using SQL for grouping, so we can use same grouping code than for other reports

Fix query builder default grouping_fields
 2022-05-12 16:54:13 +02:00
Sebastian Castro
caccbb698b Reports Refactor 2: Fix linting 2022-05-12 16:54:13 +02:00
Sebastian Castro
452a3fa933 Reports Refactor 2: Merge Spree::reports into Admin::Reports 2022-05-12 16:54:13 +02:00