Commit Graph

30960 Commits

Author SHA1 Message Date
paulo-felipe
5a5aa4c067 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context on third page and adding a product AND deleting the existing product AND adding a new product.
2023-05-19 19:55:26 -03:00
paulo-felipe
5776bdb31c refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context on third page and adding a product AND deleting the existing product.
2023-05-19 19:55:26 -03:00
paulo-felipe
b0623ab4de refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context on third page and adding a product.
2023-05-19 19:55:26 -03:00
paulo-felipe
f05e2618be refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context on third page and click next button without adding at least one product.
2023-05-19 19:55:26 -03:00
paulo-felipe
35ce463811 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context on third page.
2023-05-19 19:55:26 -03:00
paulo-felipe
7efc68281e refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context when using copy button to fill in ship address.
2023-05-19 19:55:26 -03:00
paulo-felipe
aa16110e9a refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context when resetting the billing address after clearing the bill address. MOve scenario to its before do block.
2023-05-19 19:55:26 -03:00
paulo-felipe
39a76861f3 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context when resetting the billing address after clearing the bill address.
2023-05-19 19:55:26 -03:00
paulo-felipe
79ff13e8ba refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Move on second page to a before action and clearing some elements of bill address to a before action. Let the unit test with the action isolated.
2023-05-19 19:55:26 -03:00
paulo-felipe
573ab1beb0 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context on second page when clearing some elements of the bill address.
2023-05-19 19:55:26 -03:00
paulo-felipe
384ad1ba12 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Group context for first page scenarios. Extract common customer actions to its before do block.
2023-05-19 19:55:26 -03:00
paulo-felipe
77857a0168 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Add context when date field is filled. It goes to the next page with preloaded data.
2023-05-19 19:55:26 -03:00
paulo-felipe
47b0d626e2 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Isolate when no field is filled on first screen describe it better as per reviewer suggestion.
2023-05-19 19:55:26 -03:00
paulo-felipe
0bf7e53ce4 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
Isolate when no field is filled on first screen.
2023-05-19 19:55:26 -03:00
Konrad
fed7c3da51 Merge pull request #10761 from rioug/vouchers-any-amount
[Vouchers] Flat rate of any amount
2023-05-19 17:39:33 +02:00
Matt-Yorkley
a8559e621f Simplify exchange variant callback and prefer delete over destroy
Delete is faster than destroy but should only be used if the object has no callbacks or touches.
2023-05-19 11:26:33 +01:00
Matt-Yorkley
434c9ae110 Delete exchange variants in bulk when deleting an order cycle 2023-05-19 10:46:55 +01:00
David Cook
9d7316c553 Use a fixed value for voucher factory 2023-05-19 17:19:54 +10:00
Maikel Linke
37441be371 Update translations v4.3.9 2023-05-19 14:33:23 +10:00
Maikel
0d403f4087 Merge pull request #10814 from Matt-Yorkley/serializer-eager-loading
Improve eager-loading on admin products page
2023-05-19 14:31:25 +10:00
Maikel
f943b411c5 Merge pull request #10823 from abdellani/fix-file-name-used-as-parameter
[Security] Validate product import file path
2023-05-19 14:28:09 +10:00
Maikel
7af14e37fa Merge pull request #10488 from mkllnk/dfc-connector
Serialize DFC catalog items with DFC Connector
2023-05-19 11:31:23 +10:00
filipefurtad0
8d2885e147 Updates spec after merging #10512 2023-05-18 16:04:30 +01:00
filipefurtad0
51b144f174 Covers editing into invalid combinations 2023-05-18 15:59:48 +01:00
filipefurtad0
4e2095f0fb Tests enterprise fee creation
...when inheriting tax category from product

as shared examples
2023-05-18 15:59:48 +01:00
Filipe
3d1b0816ed Merge pull request #10512 from abdellani/fix-tax-not-charged-when-tax-category-set-to-inherit-from-product
Prevent saving the enterprise fee when a per order calculator is selected along with 'Inherit from product'
2023-05-18 13:43:14 +01:00
Konrad
39bb1f6f41 Merge pull request #10832 from Matt-Yorkley/cloning
Clone all ExchangeVariant objects in bulk
2023-05-18 14:32:30 +02:00
filipefurtad0
c99829e457 Updates spec to reflect change on en.yml 2023-05-18 12:11:37 +01:00
filipefurtad0
7ea3834900 Updates warning_forfeit_remaining_amount default message 2023-05-18 11:57:15 +01:00
David Cook
360a241402 Style fix 2023-05-18 10:07:52 +10:00
Filipe
0d23b63bbd Merge pull request #10779 from dacook/10634-remove-admin_style_v2
10634 Remove admin_style_v2 feature
2023-05-17 15:37:05 +01:00
Konrad
19caadb1a0 Merge pull request #10800 from dacook/remove-localisation
Also remove localized number logic from weight calculator
2023-05-17 14:57:26 +02:00
David Cook
c0c123a92a Remove localized number logic from weight calculator
Follow-on from a46eef291c
2023-05-17 14:10:58 +02:00
Konrad
f26bef5f98 Merge pull request #10813 from saunmanoj888/fix-fullname-search-issue-on-bulk-orders
Fix searching issue with full name on bulk order management
2023-05-17 13:58:04 +02:00
saunmanoj888
aee7645e29 Fix searching issue with full name on bulk order management 2023-05-17 13:14:10 +02:00
Konrad
02873d7596 Merge pull request #10817 from Matt-Yorkley/permissions-scoping
Scope orders before bulk actions
2023-05-17 12:44:07 +02:00
Matt-Yorkley
e1b0a03819 Scope orders before bulk actions 2023-05-17 12:03:40 +02:00
Jean-Baptiste Bellet
2336981ca0 Do not display OFN banner on order confirmation email if white label 2023-05-17 11:35:18 +02:00
Jean-Baptiste Bellet
dfafbfe996 Create an order confirmation email preview of the last completed order
Available on `/rails/mailers/order_mailer/confirm_email_for_customer`
2023-05-17 11:35:06 +02:00
Jean-Baptiste Bellet
f7d06fe0e8 Do not display OFN banner on subscription confirmation email if white label
+ add specs that test for the presence of the footer logo which is in the header (I know it's a bit contradictory)
2023-05-17 11:34:35 +02:00
Jean-Baptiste Bellet
3ed89fc2db Create a subscription confirmation email preview of the last completed order
Available on: `/rails/mailers/subscription_mailer/confirmation_email`
2023-05-17 11:34:16 +02:00
Maikel Linke
eaf3bd0bae Update spec after new import file validation 2023-05-17 15:18:29 +10:00
Mohamed ABDELLANI
fcb8550cb1 extract file path sanitizer to an independent class 2023-05-17 15:09:48 +10:00
Mohamed ABDELLANI
4d5ba6a7e6 add file path validation 2023-05-17 15:09:48 +10:00
Maikel Linke
a0d05b26d1 Spec current product import vulnerabilities
I didn't use pending specs but deliberately passing specs on wrong
behaviour. This is not how it should be but how it is at the moment.
2023-05-17 15:09:01 +10:00
Konrad
4a66b62fa7 Merge pull request #10825 from jibees/10824-remove-feature-toggle-on-white-label-feature
Activate white label feature
2023-05-16 13:50:58 +02:00
Maikel
16329e953f Merge pull request #10844 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.0.0
Bump jasmine-core from 4.6.0 to 5.0.0
2023-05-16 17:50:39 +10:00
Gaetan Craig-Riou
abf2105df7 Admin::VoucherController check enterprise permission 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
355af9e818 Per review comment, build enterprise instead of create
Speed up testing by removing unnecessarily created record
2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
b585f77be4 Make enterprise mandatory for a voucher
It should have already been the case...
2023-05-16 16:20:04 +10:00