raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-04 02:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,321 Commits 16 Branches 455 Tags
9d710652d4c3c6515bc15b5091d2bcb2b60152ae
Commit Graph

10748 Commits

Author SHA1 Message Date
Konrad
ca12eab4bb Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report 
Include vouchers in report: Enterprise Fees With Tax Report By Order
 2024-01-24 22:57:48 +01:00
Konrad
5377304190 Merge pull request #12050 from cyrillefr/Replace-toggle_button_disabled_controller-with-generic-toggle_control_controller 
Replace toggle_button_disable controller with generic toggle_control controller
 2024-01-24 16:39:26 +01:00
Konrad
ec4bbe6241 Merge pull request #12038 from mkllnk/dfc-tax-category 
Spec requiring tax category when creating products
 2024-01-24 16:26:57 +01:00
Maikel Linke
e25464b38a Re-record stripe API requests 2024-01-22 10:21:15 +11:00
Filipe
487a7b2257 Merge pull request #12058 from openfoodfoundation/dependabot/bundler/stripe-10.5.0 
Filter out Stripe client_id
 2024-01-19 10:36:34 +00:00
David Cook
40166bf3e8 Update spec/support/vcr_setup.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2024-01-19 09:55:39 +11:00
David Cook
df82db9a95 Fix Layout/LineLength 2024-01-19 09:24:30 +11:00
Ahmed Ejaz
cb9c2963af 11768: add roundoff 
- Fix lint issues
 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
a3592cb14a 11768: add specs 
- For applied_voucher_rate method in order
 2024-01-19 01:52:24 +05:00
Konrad
bed405794f Merge pull request #11762 from binarygit/send-shipment-email-optionally 
send-shipment-email-optionally
 2024-01-18 12:02:00 +01:00
cyrillefr
ca4aa645f7 Delete now ununsed stimulus controller toggle_button_disabled 
- also delete one comment about replacing this controller with another
 2024-01-18 10:10:49 +01:00
David Cook
6e522cb055 Filter out Stripe client_id 2024-01-18 12:47:02 +11:00
Maikel
08ca85250a Merge pull request #12018 from openfoodfoundation/dependabot/bundler/stripe-10.5.0 
Bump stripe from 10.3.0 to 10.5.0
 2024-01-18 12:41:17 +11:00
David Cook
ccf0e78b91 Refactor 
It's not as beautiful as I hoped, but it enforces the rule. Am I going too far? Probably.
 2024-01-18 12:26:21 +11:00
David Cook
a2436e9a1a Rename hidden keys 
If they follow a rule, it reduces indirection and makes it easier to manage, I reckon.
 2024-01-18 12:14:07 +11:00
David Cook
f348cbc10c Update Stripe cassettes 
Note that stripe_account_spec.rb:51 requires a special client_id
 2024-01-17 15:16:52 +11:00
cyrillefr
8eb5ac990e Replace toggle_button_disable ctrller with generic toggle_control ctrller 
- add enableIfPresent method in toggle_control_controller.js to handle enabling on toggle
- add testing in the corresponding spec
- replace in view previous ctrler with intended generic toggle-control
 2024-01-16 20:35:21 +01:00
David Cook
137489f492 Refactor: move basic modal styles to generic parent component 
The style was already being shared with a sibling component.

Now we can instantiate a plain old 'modal'.
 2024-01-16 12:53:07 +11:00
Gaetan Craig-Riou
64043b820a Merge pull request #12030 from mkllnk/connected-apps-visibility 
Show Connected Apps only to enterprise managers
 2024-01-15 15:24:29 +11:00
Maikel
3431f89ec3 Merge pull request #11470 from openfoodfoundation/dependabot/bundler/webmock-3.19.1 
chore(deps-dev): bump webmock from 3.18.1 to 3.19.1
 2024-01-15 10:57:08 +11:00
binarygit
e865f27158 Provide correct modal-link-target-value and write tests for orders#edit page 2024-01-14 15:33:31 +05:45
binarygit
75ca1dddf1 Fix tests and rubocop warnings 2024-01-14 15:06:02 +05:45
binarygit
aa7a4fb5a2 Send shipment email by default 2024-01-14 15:06:02 +05:45
binarygit
95a51159d7 send-shipment-email-optionally 2024-01-14 15:05:59 +05:45
filipefurtad0
0a5982bb8f Update all locales with the latest Transifex translations 2024-01-12 12:12:17 +00:00
filipefurtad0
6eb56fa79b Update all locales with the latest Transifex translations 2024-01-12 11:59:48 +00:00
Maikel Linke
ad26a006e2 Remove unnecessary spec helper module 
These shared examples were used in only one spec file. It's much easier
to read having all the related specs in one file instead of hiding some
in a helper module.

It's also one less file to load whenever we run specs.
 2024-01-12 17:18:07 +11:00
Maikel Linke
c5b64e875f Remove unnecessary spec helper 
Best viewed ignoring whitespaces.

Products don't require a tax category by default. And when you activate
it via Spree::Config then it's automatically reset at the end of the spec.
We don't need this helper to do it.
 2024-01-12 17:12:40 +11:00
Maikel Linke
95c6a56e2e Simplify loading of default tax category 
The logic doesn't change but I simplified it and added more detailed
specs.
 2024-01-12 17:06:24 +11:00
Maikel Linke
30b5d065c1 Replace deprecated swagger syntax 2024-01-11 15:13:41 +11:00
Maikel Linke
78e42ec664 Show Connected Apps only to enterprise managers 
Super-admins also saw that tab but connecting an app doesn't work unless
you are a manager of that enterprise.
 2024-01-11 12:20:40 +11:00
Maikel Linke
f480997754 Spec admin enterprise menu helper 
There was no spec despite lots of logic. And I want to add more logic.
 2024-01-11 12:14:09 +11:00
Maikel
d197251262 Merge pull request #12026 from dacook/rubocop-autocorrect 
Autocorrect Rubocop issues
 2024-01-11 09:04:49 +11:00
Gaetan Craig-Riou
557e6e6a37 Return a duplicate empty string for css pack request 2024-01-10 16:46:13 +11:00
David Cook
c95d7523f6 Merge pull request #12013 from mkllnk/spec-file-helper 
DRY specs with fixture_file_upload helper
 2024-01-10 10:28:23 +11:00
David Cook
47418d9873 Merge pull request #12014 from mkllnk/voucher-on 
Remove feature toggle for vouchers, they are always on
 2024-01-10 09:58:35 +11:00
David Cook
18c2b2512b Safely autocorrect Style/RedundantLineContinuation 
Inspecting 1530 files
.................................................................................................................................................................................C................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C.......................................................................................................................

Offenses:

app/helpers/shop_helper.rb:48:43: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected.
    no_open_order_cycles?(order_cycles) &&
                                          ^
app/helpers/shop_helper.rb:48:44: C: [Corrected] Style/RedundantLineContinuation: Redundant line continuation.
    no_open_order_cycles?(order_cycles) && \ ...
                                           ^
spec/system/admin/configuration/content_spec.rb:35:64: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected.
    expect(page).to have_selector :link, "markdown link", href:
                                                               ^
spec/system/admin/configuration/content_spec.rb:35:65: C: [Corrected] Style/RedundantLineContinuation: Redundant line continuation.
    expect(page).to have_selector :link, "markdown link", href: \ ...
                                                                ^

1530 files inspected, 4 offenses detected, 4 offenses corrected
 2024-01-10 09:29:37 +11:00
Konrad
591885610a Merge branch 'master' into task/11923-add-vouchers-to-oc-customer-total-report 2024-01-09 18:51:47 +01:00
Rachel Arnould
f7aca7a9f1 Merge branch 'master' into 11431-show_warning_when_a_new_invoice_can_be_generated 2024-01-08 16:38:39 +01:00
Rachel Arnould
bd0a296100 Merge pull request #11846 from chahmedejaz/task/11068-delete-product-or-variant 
[BUU] Add option to delete a product or variant
 2024-01-08 13:17:29 +01:00
Jean-Baptiste Bellet
9ea6fc00cb Ignore test.host host to avoid error 
```
Failed to open TCP connection to test.host:80
```
 2024-01-08 16:54:53 +11:00
Jean-Baptiste Bellet
f500d1e7a8 Instead of stubbing CSS pack requests, ignore them with VCR 2024-01-08 16:54:53 +11:00
Maikel Linke
4e510e9bd0 Avoid warning hiding main menu in report spec 2024-01-08 15:54:25 +11:00
Maikel Linke
a8c83b670b Remove superfluous feature tag from specs 2024-01-08 15:53:50 +11:00
Maikel Linke
e2eead0f86 Scroll to reveal White Label tab 
The Vouchers tab pushed the White Label tab further down and it was
hidden by the savebar. The CSS adjustment in this commit makes sure
that users can always see all menu items.

The automatic scrolling by Capybara fails because of the savebar but
scrolling to the bottom works.
 2024-01-08 15:52:17 +11:00
Maikel Linke
2699ae6ca7 DRY terms of service PDF file use in specs 2024-01-08 13:01:21 +11:00
Maikel Linke
dd639435f1 Remove unnecessary image file helper 2024-01-08 13:01:21 +11:00
Maikel Linke
6327f46733 Use fixture_file_upload helper where possible 
We can't use it in factories but in other places it's a nice shortcut.
 2024-01-08 11:32:01 +11:00
Maikel Linke
41112c1462 DRY uploaded file use in specs 2024-01-08 11:32:01 +11:00
Maikel Linke
57a6d1ef06 Partial spec of error message for readability 
This avoids Rubocop warnings. We don't need to test for the whole
message. The tested part is unique already and quicker to read.
 2024-01-05 11:48:30 +11:00