Konrad
9e6b8e0624
Merge pull request #12047 from rioug/12021-enterprise-fee-tax-on-invoice
...
Include Tax on enterprise fees on the invoice
2024-01-31 15:32:54 +01:00
David Cook
97ab41b47e
Merge pull request #12068 from mkllnk/dfc-enterprise-promo-image
...
Add promo image to DFC Enterprise API
2024-01-31 13:35:47 +11:00
Maikel
865394913b
Merge pull request #12098 from filipefurtad0/shopfront_message_redirect_pending_test_for_12076
...
[Pending spec] Updates distributor to have a shopfront message (reproduces #12076 )
2024-01-30 11:56:40 +11:00
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
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
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
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
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
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
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 Linke
301add4992
Remove faulty migration generation
...
The long timestamps don't play well with Rails default timestamps for
migrations. They are always seen as the newest. Not using long
timestamps leads to duplicate timestamps though.
The better solution is to use `rails generate migration` and copy the
`change` method.
2024-01-15 14:36:23 +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
