Konrad
503148b13b
Merge pull request #12653 from wandji20/wb-OFN-11613
...
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-14 18:14:33 +02:00
wandji20
f325857e1f
Strip end of long invoice table header names due to names not properly parsed when converting pdf to text [OFN-12214]
2024-08-13 18:23:27 +01:00
wandji20
35169f66dc
Include order cycle spec for non-simple cycles [OFN-11613]
2024-08-12 23:16:04 +01:00
Gaetan Craig-Riou
feb429fee7
Fix typo
2024-08-12 18:47:16 +01:00
wandji20
1e71db9315
Remove permalinmk from taxons [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
a85cfab506
Remove awesome nested set gem and dependencies [OFN-11636]
2024-08-12 18:47:16 +01:00
Ahmed Ejaz
e2e3aa9281
12698: add specs
2024-08-12 15:16:47 +05:00
wandji20
ea238829a8
Revert front end validation and implement backend validation for changes in datetime order cycle values [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
91fddeaa8b
Fix failing spec [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
0de8a90b14
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-12 09:05:48 +01:00
Gaetan Craig-Riou
1f55ff4b72
Merge pull request #12729 from mkllnk/fdc-update
...
Remove now unneeded FDC compatibility code from product import
2024-08-12 11:14:44 +10:00
Cillian O'Ruanaidh
a6d3909e95
Replace text-angular editor with trix editor in fields for shop messages and about fields for enterprises and enterprise groups
2024-08-09 10:37:23 +01:00
Filipe
76d874d5f9
Merge pull request #12710 from chahmedejaz/bugfix/12705-fix-products-index-page
...
[BUU] Fixes Products Page ActionView::Template::Error
2024-08-08 16:20:26 +01:00
Rachel Arnould
81711e4c43
Merge pull request #12721 from dacook/connected-apps-settings-12549
...
New settings screen to activate each connected app type
2024-08-08 16:56:33 +02:00
Ahmed Ejaz
647a384561
12705 - add specs for updating invalid unit_value
2024-08-07 16:59:10 +05:00
Maikel Linke
ec828c335d
Remove superfluous FDC-specific request class
2024-08-07 15:09:05 +10:00
Maikel Linke
6d03a8ddf3
Test that the FDC is now complying with the DFC
2024-08-07 15:09:05 +10:00
David Cook
a95aa1b3e9
Submit blank value if nothing selected
...
If a checkbox is not selected, the browser does not submit it at all.
2024-08-07 10:30:45 +10:00
Gaetan Craig-Riou
6139ba3015
Merge pull request #12738 from mkllnk/flaky-exchange-id
...
Stabilise spec by not relying on record ids
2024-08-07 09:41:00 +10:00
Joseph Johansen
5ca7f40a4e
Add unit test
2024-08-06 16:12:13 +01:00
Konrad
256d5ba61c
Merge pull request #12725 from wandji20/wb-OFN-12280
...
(Fix) chore(deps): bump invisible_captcha from 2.2.0 to 2.3.0
2024-08-06 15:04:38 +02:00
Konrad
cb42e7e119
Merge pull request #12671 from wandji20/wb-OFN-12591
...
Ensure product category error message is shown when creating new product [OFN-12591]
2024-08-06 14:09:59 +02:00
David Cook
5d732d80a6
Add connected apps settings screen
...
I considered adding a request spec, but figured it still doesnt' test the form, so better to use a full system spec.
2024-08-06 11:26:03 +02:00
David Cook
4223b36bc3
Only show enabled connected app types
...
The preference will be set from the admin interface in a new commit
It would be nice if we had an array/list type for preferences. Probably not too hard to implement, but this will do.
2024-08-06 11:26:03 +02:00
David Cook
fcea437d7e
Only show connected apps in enterprise settings, if system setting is enabled
2024-08-06 11:26:03 +02:00
wandji20
b49da46842
Pluralize admin products search result [OFN-12532-v1]
2024-08-06 08:52:51 +01:00
Maikel Linke
e055b8b16c
Stabilise spec by not relying on record ids
...
A spec was referring to and input id:
```
"order_cycle_incoming_exchange_0_variants_#{new_product.variants.first.id}"
```
But sometimes the exchange would have the id 1 instead of 0 and the test
would fail. Instead I opted to select the field by text visible to the
user.
2024-08-06 12:31:54 +10:00
Maikel
f5875e4c0b
Merge pull request #12667 from cyrillefr/FixRailsRootPathnameMethods
...
Fixes Rails/RootPathnameMethods offense
2024-08-06 11:02:28 +10:00
Gaetan Craig-Riou
7e1af9e04b
Merge pull request #12723 from johansenja/optimise-shops-page
...
Preload enterprise logos and promo images for /shops page
2024-08-05 13:54:20 +10:00
Filipe
7939bf8038
Revert "Pluralize admin products search result [OFN-12532]"
2024-08-05 10:03:58 +10:00
Ahmed Ejaz
d4e0b2ab51
12705 - fix specs
2024-08-04 18:20:15 +05:00
Ahmed Ejaz
1014a50aff
12705 - incorporate old UI behavior
...
- if unit_value is not present and unit_description then display unit_description only.
- if both are not present then display empty fields
2024-08-04 17:47:02 +05:00
Filipe
5012c52438
Merge pull request #12711 from cillian/wider-item-column-on-invoice-pdf
...
Make Item column wider and tax and quantity columns narrower in invoice PDF
2024-08-02 10:20:24 +01:00
Maikel Linke
2201d2e8c2
VariantOverride with on_demand now overriding stock
...
Otherwise we would try to take stock from the producer stock level
without respecting their on-demand settings. So from now on:
If stock level or on_demand are set on the override then it's not using
producer stock levels.
2024-08-02 14:40:17 +10:00
Maikel Linke
b6c407971d
Allow on-demand VariantOverride to track stock
...
We allowed this for producer stock and need to do the same for inventory
stock. This will allow us to create backorders for missing, but promised
stock.
2024-08-02 14:40:17 +10:00
Maikel Linke
cd8dc41b15
Update stock specs and add pending cases
2024-08-02 14:40:17 +10:00
Maikel Linke
a1887bdc76
Update stock levels of on-demand items
...
We weren't bothering with stock when items were on demand anyway. But we
want to track stock now so that we can backorder more when local stock
levels become negative.
2024-08-02 14:40:17 +10:00
Maikel Linke
675b7febdf
Test stock logic on variant level
...
VariantOverrides are bolted onto variants to change their logic.
2024-08-02 14:40:17 +10:00
Maikel Linke
90fdf59415
Test current stock logic on shipment level
...
During checkout, stock is adjusted when a shipment is finalised. The
chain is:
* Order state change to complete.
* Trigger Order#finalize! which updates shipments.
* Trigger Shipment#finalize! which adjusts stock on the variant.
* A variant holds stock in stock items or in a variant override.
2024-08-02 14:40:17 +10:00
Maikel Linke
99b31d05cb
Fix flaky spec with fixed order of products
2024-08-02 14:26:54 +10:00
Konrad
1a72b5b227
Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator
...
Display only per_item fees for oc incoming exchange #11326
2024-08-02 03:11:27 +02:00
wandji20
a1aea54405
Disable recaptcha spiner check in test environment [OFN-12280]
2024-08-01 21:43:51 +01:00
Joseph Johansen
ffe4603f2f
Preload enterprise logos and promo images for shops page
2024-08-01 14:10:53 +01:00
wandji20
ebc794194f
Add product spec when supplier is empty and remove error status code from product create action [OFN-12591]
2024-08-01 09:03:26 +01:00
wandji20
287f65ec8e
Ensure product category error message is shown when creating new product [OFN-12591]
2024-08-01 08:58:54 +01:00
Filipe
ce44f19b4a
Merge pull request #12704 from cyrillefr/FilteringProductBySupplierPropertyBreaksWhenEnterpriseHasCustomSortingByCategorySet
...
Fixes 422 error due to bad sql building
2024-07-31 19:45:09 +01:00
Filipe
6c214543ad
Merge pull request #12690 from wandji20/wb-OFN-12666
...
Require variant category and supplier when creating new product variants [OFN-12666]
2024-07-31 19:28:31 +01:00
Filipe
8b1713d169
Merge pull request #12665 from wandji20/wb-OFN-12532
...
Pluralize admin products search result [OFN-12532]
2024-07-31 18:55:53 +01:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02:00
wandji20
55df9416cc
Add test to check when new variant category and producer is empty [OFN-12666]
2024-07-30 12:09:59 +01:00