Matt-Yorkley
617164684c
Configure OIDC
2022-10-18 11:32:14 +11:00
Ashwini Seshadri
1596649034
Merge branch 'master' into admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier
2022-10-13 06:48:40 +02:00
jibees
daaff2f7e8
Merge pull request #9764 from mkllnk/simple-oc-spec
...
Stabilise spec by waiting for JS requests
2022-10-12 10:17:51 +02:00
Maikel Linke
9da6f862cd
Stabilise pending spec
2022-10-12 16:49:29 +11:00
Maikel Linke
3eb597bff4
Fix specs which accidentally reversed relationships
2022-10-12 16:49:29 +11:00
Ashwini Seshadri
590a09f069
Fixed the permissions relationship, so the shop displays only suppliers and does not display distributors in producers list
...
and updated relevant tests
2022-10-12 16:48:31 +11:00
Maikel
1d9fbbf69e
Merge pull request #9767 from jibees/fix-flaky-spec
...
BOM Specs, don't need to wait for UI feedback: only check on page content
2022-10-12 11:52:50 +11:00
Rachel Arnould
617a417dc2
Merge pull request #9506 from binarygit/remove-angular-from-payment-methods
...
Remove angular from payment methods
2022-10-11 13:13:26 +02:00
Jean-Baptiste Bellet
bfbdb5f44b
Don't need to wait for UI feedback: only check on page content
...
ie. table content
2022-10-11 12:16:25 +02:00
Maikel Linke
5bbbe4b67a
Stabilise spec by waiting for JS requests
...
Well, two seconds is just a guess. Ideally the page wouldn't display
until we have everything loaded. But this logic will be replaced when we
chuck out AngularJS.
This version passed over 100 runs with a busy CPU on my machine.
2022-10-11 14:57:59 +11:00
Maikel
2082404c87
Merge pull request #9752 from maniSHarma7575/9603-fix-order-cycle-fees-dropdown
...
Fixed same enterprise appear several times in the fee dropdown list
2022-10-11 09:41:02 +11:00
Manish Sharma
cd71233163
Fixed duplicates enterprises in order cycles
2022-10-10 14:30:58 +05:30
Maikel Linke
6ef0e04c18
Mark currently broken spec as pending
...
I thought it's better to progress with this PR before we break more
things.
2022-10-10 16:03:18 +11:00
Maikel Linke
87274bccc6
Remove retries from test runs
...
If a spec is flaky, we need to fix it. Retry is just hiding problems for
a while and is adding to execution time.
2022-10-10 14:09:18 +11:00
Maikel
82e38d7b91
Merge pull request #9526 from jibees/6730-use-a-date-range-picker
...
Admin, List of Orders & Orders Bulk Management pages: use a date range picker
2022-10-10 13:59:37 +11:00
Maikel
5894246474
Merge pull request #9682 from binarygit/picked_up_email
...
Send picked up emails when orders are picked up
2022-10-10 13:15:24 +11:00
Maikel
058a45f4e5
Merge pull request #9442 from jibees/8904-display-fees-name-instead-of-type-on-invoices
...
Display fees name instead of type on invoices
2022-10-10 13:15:01 +11:00
Maikel
e5ccee42cc
Merge pull request #9725 from vsmay98/9468-hide-all-references-hub-from-producers-profile
...
[Shopfront] Hide hub with "hide all references" setup in producers profiles
2022-10-10 13:11:49 +11:00
Maikel
38f145549a
Merge pull request #9741 from mkllnk/empty-variant-param
...
Avoid error when sending empty variant attributes in bulk product edit
2022-10-10 11:43:10 +11:00
Jean-Baptiste Bellet
263b36d1d9
Confirm input changed by pressing enter key
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
a272479483
When selecting date range picker, orders should load
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eec117e769
Implements daterangepicker for /admin/orders/bulk_management
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eb621cae35
Update spec to be more defensive
...
Actually, this one fail on master too (when changing month?)
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
73f55ae776
Implements daterangepicker for /admin/orders
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Maikel Linke
1137e6890b
Supply feature mock with default value
...
Otherwise Rspec complains about receiving another argument which is not
the one we defined here before.
2022-10-08 16:23:17 +02:00
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
Maikel Linke
bc26a3aa07
Add used feature toggles to appear in the admin UI
...
The admin UI shows only features which were added to the database. We
always had to look up a feature's name add it manually before we could
enable it. Now it will appear in the UI after some code asked if it was
enabled.
This only adds a database query once when the feature doesn't exist yet.
The `feature.exist?` call only performs an in-memory lookup in the
memoizer.
2022-10-08 16:23:17 +02:00
binarygit
01c477f2cb
Remove angular from Payment Methods
2022-10-08 14:20:54 +02:00
binarygit
8335594351
Add different subject for picked up email
2022-10-08 12:31:26 +02:00
binarygit
44db511e66
Send a picked up email (rather than shipped email) when orders are picked up by customers
2022-10-08 12:31:26 +02:00
Jean-Baptiste Bellet
8b89c901ef
Do not display "Admin and Handling" ie. fees total
2022-10-08 10:00:57 +02:00
Maikel Linke
b297299838
Simplify test of adjustments
2022-10-08 10:00:57 +02:00
Maikel Linke
52843de1da
Test against unique fee name
...
The adjustment factory calls everything "Shipping" by default. This was
confusing here because we were explicitely looking at a non-shipping
fee.
2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
77e644e3d4
Get adjustment which is not the shipping one
2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
72df2867d4
Remove admin_and_handling merging
...
+ update specs as well
2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
0cc8349c71
Use fee name for the adjustment label instead of type
...
+ update specs as well
2022-10-08 10:00:57 +02:00
Maikel Linke
95d68b98a9
Spec both cases of removing variants from order cycles
...
The spec tested only the removal but not he keeping of variants.
I want to change this in the next commit to simplify the class.
2022-10-08 09:03:38 +02:00
Vishal Jain
b582b61414
add specs to not include hidden hubs
2022-10-07 11:24:32 +02:00
Maikel
8072e97579
Merge pull request #9721 from filipefurtad0/fix_flaky_shopping_spec
...
Addresses flakyness in shopping_spec.rb
2022-10-05 13:19:23 +11:00
filipefurtad0
977916cb11
Adds 2 sec sleep time on other flaky examples
2022-10-04 20:58:30 +01:00
filipefurtad0
f4edfcefa2
Adds 2 sec sleep time
2022-10-04 20:17:14 +01:00
binarygit
25ae10dbe8
Create bulk orders cancellation feature
2022-10-04 16:57:31 +02:00
filipefurtad0
7b592fd80b
Adds assertion after page visit to promote page loading
2022-10-04 12:27:58 +01:00
filipefurtad0
8e6f828f66
Splits it cases into respective contexts
2022-10-03 19:30:57 +01:00
filipefurtad0
fa05327342
Adds assertions on clearing searches
...
Asserts on page contents
2022-10-03 19:12:27 +01:00
filipefurtad0
cafa17ec13
Splits test into two assertions
2022-10-03 19:12:27 +01:00
jibees
0c64720a9e
Merge pull request #9710 from mkllnk/9002-customer-association-updates
...
Associate and update customer records when ordering
2022-09-30 16:36:01 +02:00
Filipe
4b279d28dd
Merge pull request #9262 from cillian/order-cycle-shipping-methods
...
Let people customise which shipping methods are available to customers on order cycles
2022-09-30 14:36:37 +01:00
Cillian O'Ruanaidh
acd4706890
Set closing time correctly in order_cycles/complex_creating_specific_time_spec.rb
2022-09-30 14:22:11 +01:00
Filipe
f7d21406a1
Merge pull request #9702 from ashwini-seshadri/master
...
Fix for new subscription dialog
2022-09-30 13:32:42 +01:00
