Maikel
6caae9e886
Merge pull request #7694 from coopdevs/split-confirm-order-job
...
Split ConfirmOrderJob to avoid blocking DJ worker
2021-06-09 14:11:10 +10:00
Andy Brett
b6f6407c31
Merge pull request #7660 from jibees/7499-remove-feature-toggle-for-unit-price
...
Remove feature toggle around unit_price
2021-06-08 10:39:32 -07:00
Andy Brett
fe62a0a2a7
Merge pull request #7697 from jibees/7689-trigger-a-change-when-hour/minute-inputs-are-modified
...
Datetimepicker for order cycles: add keyup event listener on hour/minute inputs
2021-06-08 10:32:07 -07:00
Jean-Baptiste Bellet
e3f56556cf
Remove feature toggle around unit_price and enable it
2021-06-07 20:53:45 +02:00
Matt-Yorkley
efcf71fd2b
Use OrderContents in cart spec test setups
2021-06-04 17:26:49 +01:00
Matt-Yorkley
d5edf03042
Update reports_spec test setup
2021-06-04 17:10:50 +01:00
Andy Brett
b3e08b47b9
set Stripe api key directly instead of using allow
2021-06-01 22:33:12 +01:00
Jean-Baptiste Bellet
60f3ebca62
Check whether the changes made by the keyboard are taken into account in datetimepicker
...
- User can change minute directly with keyboard, and without closing the datetimepicker, the modification should be catch and then a label "You have unsaved changes" with the "Save changes" button should appear
2021-06-01 12:05:03 +02:00
Pau Perez
74a8b3038a
Split ConfirmOrderJob to avoid blocking a worker
...
This unties this two email notifications so that they are picked up by
a DJ worker independently. This should avoid the blocking the worker experiences (remember we
still have a single one in all instances) when waiting between the two
deliveries. See the flamegraph:
https://app.datadoghq.com/apm/traces?end=1622015605459&paused=true&query=env%3Aproduction%20service%3Adelayed_job%20operation_name%3Adelayed_job%20resource_name%3AConfirmOrderJob%20%40duration%3A%3E%3D5s&start=1622009898303&streamTraces=true&trace=AQAAAXmngbg_woqc_QAAAABBWG1uZ2IwVkFBRHVDbWJkN25QTUVuY28&traceID=2916038355421570548&spanID=2005781139590273685 .
Overall, both operations may take longer but other jobs can be processed
in between. Also, if any of the two fails, the other won't be affected.
2021-06-01 11:43:00 +02:00
Pau Pérez Fabregat
0f78b5b315
Merge pull request #7616 from jibees/7602-unit-price-not-displaying-when-comma-is-the-decimal-separator
...
Backoffice: Unit price not displaying when comma is the decimal separator
2021-05-27 17:45:19 +02:00
Pau Pérez Fabregat
0d5f76b19e
Merge pull request #7621 from jibees/7534-upload-logo-and-promo-image-for-enterprise
...
Upload enterprise image (logo and promo): force content type to "text/plain"
2021-05-27 11:33:56 +02:00
Pau Pérez Fabregat
bfa77baae1
Merge pull request #7542 from jibees/6359-add-payment-method-description-to-invoice
...
Add payment method description to invoice
2021-05-27 11:01:07 +02:00
Jean-Baptiste Bellet
0c8bfea2f7
Add feature tests for upload images on enterprise registration
...
For both logo and promo images
2021-05-25 15:30:35 +02:00
Matt-Yorkley
74f27544f7
Merge pull request #7647 from andrewpbrett/default-country-codes
...
Use correct default country code
2021-05-25 11:21:34 +02:00
Andy Brett
120fc4ca42
Merge pull request #7605 from filipefurtad0/import_item_products
...
Products and Inventory import: Items units
2021-05-24 14:17:43 -07:00
Jean-Baptiste Bellet
afe97bcc96
Add tests for creating/editing product/variant cases with decimal price
2021-05-24 10:55:05 +02:00
Jean-Baptiste Bellet
8af6fedf8a
Factorize js:true as a common configuration around all tests
2021-05-24 10:55:05 +02:00
Pau Pérez Fabregat
23b2b5ba56
Merge pull request #7563 from filipefurtad0/import_products_fixture_path
...
Adds file and fixture path to test product import
2021-05-21 10:12:20 +02:00
filipefurtad0
2f842bcbdd
Adds file and fixture path to test product import
...
Adds file and fixture path to test product import
Reverts changes on context and it descriptions
2021-05-20 20:08:47 +01:00
Luis Ramos
f8e5370b0b
Replace update_attributes with update
2021-05-19 09:54:25 -07:00
Luis Ramos
fb560089b9
Replace usages of update_attributes! with usage of update!
2021-05-19 09:54:25 -07:00
Luis Ramos
b2e97fe1d2
Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
2021-05-19 09:54:22 -07:00
Andy Brett
e73584fef7
remove setters from DefaultCountry service
2021-05-19 09:42:52 -07:00
Jean-Baptiste Bellet
325b97b683
Add tests around invoice printing in PDF
...
- use PDF Reader to read pdf and get its content
- check with we print the payment description information section with the right value
2021-05-19 11:55:46 +02:00
Andy Brett
7df2915fbd
add DefaultCountry service
2021-05-18 12:44:53 -07:00
filipefurtad0
0cd6c53e0d
Adds test-case on the inventory import for unit Items
2021-05-10 19:12:41 +01:00
filipefurtad0
5475b79cde
Adds test-case on the product import unit Items
2021-05-10 19:07:05 +01:00
filipefurtad0
8e24c655b0
Adds verification of inventory import on inventory page
2021-05-10 19:01:41 +01:00
filipefurtad0
bb5452ad26
Adds verification of product import on products page
2021-05-10 18:57:47 +01:00
Andy Brett
17a0063b40
Merge pull request #7402 from filipefurtad0/products_spec_add_ons
...
Adds coverage for product deletion and cloning
2021-05-10 06:26:11 -07:00
Pau Pérez Fabregat
8d8abed529
Merge pull request #7496 from jibees/4957-flaky-specs
...
Uncomment flaky spec on variant_overrides_spec.rb
2021-05-07 10:29:36 +02:00
filipefurtad0
a476416dc4
Removes html tr tag; Clarifies it block
2021-05-03 17:03:34 +01:00
Andy Brett
be0eb5f5f9
ignore nil in payment report spec expectation
2021-05-03 14:17:54 +01:00
filipefurtad0
19768e1398
adds coverage for product deletion and cloning
2021-05-02 18:33:13 +01:00
Pau Pérez Fabregat
057bcddee9
Merge pull request #7478 from jibees/7458-get-products-on-order-cycle-change-events
...
Get the whole list of products on order cycle changes
2021-04-30 11:39:15 +02:00
Andy Brett
8ba139c6fb
Merge pull request #6825 from julesemmac/6584-map-location-confirm
...
6584 map location confirm
2021-04-29 14:04:06 -07:00
Jean-Baptiste Bellet
5a3771fc42
Add special config to avoid a inconsistant LoadError
...
Error is
```
Failure/Error: @app.call(env)
LoadError:
Unable to autoload constant Api::V0::OrderCyclesController, expected /Users/jibees/dev/openfoodnetwork/app/controllers/api/v0/order_cycles_controller.rb to define it
```
2021-04-29 15:31:24 +02:00
Pau Pérez Fabregat
6c5db0f836
Merge pull request #7507 from Matt-Yorkley/shipment-state-update
...
Shipment callback state update
2021-04-29 12:01:55 +02:00
Matt-Yorkley
2fda550821
Add test for shipment state after ship action
2021-04-28 21:40:08 +01:00
Pau Pérez Fabregat
ef9720aee7
Merge pull request #7461 from andrewpbrett/fix-blocked-bo-orders
...
Scope variant to take overrides into account in packer
2021-04-28 19:36:02 +02:00
Matt-Yorkley
c7e65185ee
Regression test for new order with variant overrides
2021-04-27 07:44:41 -07:00
Matt-Yorkley
22f79fe540
Reload order before updating in Payment callback
2021-04-27 14:27:35 +01:00
Matt-Yorkley
a5a324fd6f
Add failing spec for payment and shipment states bug
...
The order was being left in an unexpected condition here, it's states are not set and there seem to be some weird issues.
2021-04-27 14:27:35 +01:00
Matt-Yorkley
5934b100e9
Test payment and shipment states in checkout spec
...
If these aren't behaving correctly we need to know about it...
2021-04-27 14:27:35 +01:00
Jean-Baptiste Bellet
81385b63c7
Uncomment (not so) flaky spec
2021-04-27 15:27:16 +02:00
Jean-Baptiste Bellet
5085501f89
Add automated tests around pagination in product list for a shop
...
- with two order cycles and go from one to the other
2021-04-27 11:24:56 +02:00
Andy Brett
de02acad64
add feature spec
2021-04-26 15:42:36 -07:00
Cillian O'Ruanaidh
c41476423b
Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb
2021-04-22 19:43:49 +01:00
Pau Pérez Fabregat
cf2e3db645
Merge pull request #7445 from jibees/7403-add-customer-name-into-subscriptions-table
...
Add customer name into subscriptions list in order to search subscription by customer name
2021-04-22 19:46:49 +02:00
Jean-Baptiste Bellet
05a00a07ef
Add test on order creation and correct display of the error
...
- The error "Line items can't be blank" should not be displayed when we first arrived on this page after creation but only if we update the page
2021-04-22 10:03:43 +02:00
