raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

12632 Commits

Author SHA1 Message Date
Maikel
fff1a21688 Merge pull request #12074 from filipefurtad0/vcr_credit_card_clone_destroyer_spec 
[Stripe, VCR] Updates credit_card_cloner_spec.rb
 2024-01-30 11:24:04 +11:00
filipefurtad0
d2bb53da5b Removes assertion on bogus_customer 
When running the CI we actually assert on the bogus credentials, which breaks the spec

Removes unecessary StripeStubs inclusion
 2024-01-29 20:04:38 +00:00
filipefurtad0
318a8113ed Updates distributor to have a shopfront message 
Doing so, enables a homepage for that enterprise, which surfaces issue #12076. The test as been set as pending, which needs to be changed when the issue is fixed
 2024-01-29 15:52:31 +00:00
Gaetan Craig-Riou
e129ef38c2 Refactor total method to use sum instead of reduce 
Plus some extra specs to cover missing scenarios
 2024-01-29 14:12:28 +11:00
Cillian O'Ruanaidh
f960dec0eb Display a warning when clicking the generate invoice button if an ABN is required but not present 2024-01-26 14:28:42 +00:00
filipefurtad0
3e734f1e6b Attaches customer to payment method and clones payment method 
Improves naming of actors; improves assertions
 2024-01-25 18:43:05 +00:00
filipefurtad0
baef7de663 Replaces stubs with real accounts and card ids 
The second example on this sepec is commented out, and will be addressed on the following commit

Sets user email

We need to set an email for the user we're creating; if we don't, then each time we run the spec, a new user will be created with a random email - as per user factory. This will translate in a (slightly) different HTTP request each time the spec is ran, and will cause a VCR recording error as new cassettes cannot be recorded in under the CI.

Re-recordes cassette after rebase
 2024-01-25 18:43:03 +00:00
Rachel Arnould
96d2021b72 Merge branch 'master' into buu/add-product-images-11065 2024-01-25 16:32:45 +01:00
cyrillefr
e6c0afa477 Replace toggle_controller with method inside generic ctrller 
- move toggle method from toggle_controller inside toggle_control
    ctrller
  - change corresponding html attributes in view
  - mode corresponding spec in toggle_controller ctrller spec
  - delete now unused toggle controller + spec
 2024-01-25 10:16:02 +01:00
David Cook
a005069394 Merge pull request #12041 from mkllnk/migrations 
Remove migrations with faulty ids
 2024-01-25 17:29:23 +11:00
David Cook
6ffe125820 Override default messages 
Just in case any bots have been trained to handle the gem's default messages.
 2024-01-25 17:24:27 +11:00
David Cook
2535435b55 Test success with invisible_captcha 2024-01-25 17:09:18 +11:00
David Cook
0638b9eea4 Use unique email address for test 
Using the existing user email is only needed for the 'already registered' test.
:
 2024-01-25 17:06:25 +11:00
David Cook
c3914bc7ae Merge pull request #11759 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.3.1 
chore(deps): bump tom-select from 2.2.3 to 2.3.1
 2024-01-25 16:26:10 +11:00
David Cook
a915182bf8 Add tests for image controller 2024-01-25 14:14:58 +11:00
David Cook
f72154e40c Add image create form 
Re-using the edit image form, because they're basically the same.
 2024-01-25 14:14:58 +11:00
David Cook
07bef860b2 Add spec for updating image 2024-01-25 14:14:58 +11:00
David Cook
25f4954795 Combine spec 2024-01-25 14:14:58 +11:00
David Cook
e92f4a120a Refactor: re-organise spec file 
No code changes, just moving it around and renaming blocks. Best viewed with white-space ignored.
 2024-01-25 14:14:58 +11:00
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
Gaetan Craig-Riou
048619d660 Move disabling timestamp check to the spec helper 2024-01-24 15:56:25 +11:00
Gaetan Craig-Riou
67dc79b074 Replace tomselect_search_and_select by tomselect_select 
In these scenarios, searching for the option is not actually required,
we can directly click on the needed option. It prevent issue with
the dropdown option staying open and breaking specs.
 2024-01-24 14:53:44 +11:00
Gaetan Craig-Riou
98545741e6 Add tomselect_select helper 
When using `tomselect_search_and_select` and searching isn't really
required it leaves the dropdown option open. It can then cause problem
when trying to interact with other element in the page. This happens
because clicking on the chosen option happena before the searching
finishes.
We can now use `tomselect_select` when searching is not actually
required.
It should not be a problem when search is required, as capybara will
wait for the option to appear on the page before clicking.
 2024-01-24 14:47:21 +11:00
Maikel Linke
d12c0a7d9d Fixup: Remove unused method from spec 2024-01-24 12:09:02 +11:00
Gaetan Craig-Riou
f4ea71eb3c Fix check for locale cookie 
For some reason the app set an `_ofn_session_id cookie`, which broke
the assertion expecting no cookie.
 2024-01-24 10:04:49 +11:00
Gaetan Craig-Riou
910d0a91f7 Small style refactor. 
- Replace `context` by `describe`, although they are equivalent, they
don't convey the same intent.
- Remove "should" in `it` descrption
 2024-01-23 16:35:13 +11:00
Gaetan Craig-Riou
d8876c40b8 Add invisible_captcha on the user registration page 
The default action when a user submit the form too quickly is to
redirect to :back with flash error message. As we are using CableReady
it's not working for us, so I render_alert_timestamp_error_message
to show the error message to the user.
 2024-01-23 16:30:12 +11:00
Gaetan Craig-Riou
270a310e0f Use send_keys to populate tom select input 
Setting the value directly doesn't trigger the search, presumably
because it doesn't trigger any javascript event.
 2024-01-23 11:52:01 +11:00
Gaetan Craig-Riou
fab6a79dae Fix various method to remove or add enterprise fee tax 2024-01-23 10:36:58 +11:00
Gaetan Craig-Riou
b28e63174d Update display_line_items_taxes 
Make sure we add the correct enterprise fee tax amount based on tax
being included in the price or not.
 2024-01-23 10:36:43 +11:00
Gaetan Craig-Riou
bfe8f08910 Refator, add total_additional_tax and total_included_tax 
They are used to add/remove enterprise fee tax as needed
 2024-01-23 10:35:09 +11:00
Maikel Linke
fc75ea97a2 Add promo image to DFC Enterprise API 
We want to use this image in the Discover Regenerative portal in
Australia. The property is read-only and the API doesn't support the
upload of a new file.

The enterprise factory needed fixing as well. This trait hadn't been
used anywhere else.
 2024-01-22 16:21:10 +11:00
Gaetan Craig-Riou
a77ba5b0b1 Include enterprise fee tax in the line item tax 2024-01-22 13:08:39 +11:00
Gaetan Craig-Riou
913da34228 Add EnterpriseFeeAdjustments 
It represent a collection of enterprise fee adjustments. Currently
it only allows you to calculate the tax amount relating to enterprise
fees when tax is not included in price
 2024-01-22 13:08:39 +11: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