Cillian O'Ruanaidh
4e6d64c0a1
Let people choose which payment methods are available to customers on order cycles
2022-10-21 17:21:31 +01:00
jibees
3a68e237de
Merge pull request #9772 from mkllnk/revenue-report-for-au
...
Add more fields to revenue report as used by Aus
2022-10-20 23:10:17 +02:00
jibees
48e18b016a
Merge pull request #9756 from vsmay98/8249-fix-snail-for-all-shipping-method-fee
...
Fix snail issue for all shipping method fees
2022-10-20 17:31:24 +02:00
jibees
da851079f4
Merge pull request #9776 from abdellani/product-creation-minor-improvements
...
Product creation minor improvements
2022-10-20 17:30:47 +02:00
jibees
1d265d19ce
Merge pull request #8872 from Matt-Yorkley/bugsnag-data
...
Update Bugsnag error data
2022-10-20 17:30:14 +02:00
jibees
fdc362cb44
Merge pull request #9806 from mkllnk/feature-constraint
...
Generalise feature toggle constraint
2022-10-20 17:27:46 +02:00
filipefurtad0
c4de247dd9
Clarifies contexts, cleans-up spec DRY
2022-10-19 16:56:04 +01:00
jibees
7b96a1fb5b
Merge pull request #9815 from mkllnk/bulk-product-spec
...
Stabilise spec by waiting for JS
2022-10-19 09:50:55 +02:00
Matt-Yorkley
980f004b83
Update Bugsnag error data
2022-10-19 17:36:52 +11:00
Maikel Linke
04921aeed4
Stabilise spec by waiting for JS
2022-10-19 09:59:51 +11:00
filipefurtad0
c71c5054e0
Replaces js select2 methods by find/click methods
2022-10-18 21:27:52 +01:00
filipefurtad0
b3059bbdbc
Comments out and adds pending on flaky examples
2022-10-18 10:28:44 +01:00
Maikel Linke
a35fab5e1f
Speed up spec by skipping a page
2022-10-18 14:27:18 +11:00
Maikel Linke
c22f6cb805
Add more fields to revenue report as used by Aus
...
We currently maintain our own CSV generation script which could be
replaced if we got all this information here.
2022-10-18 12:51:13 +11:00
Mohamed ABDELLANI
96c6f58ba2
fix test @/spec/system/admin/products_spec.rb:32
2022-10-14 03:26:40 +01: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
Maikel Linke
81461684f3
Generalise feature toggle constraint
...
Now we can re-use it for any feature.
2022-10-13 10:42:20 +11: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
Vishal Jain
e02de2b17d
Fix snail issue for all shipping method fees
2022-10-11 15:30:19 +05:30
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
