Filipe
cb540d66c6
Merge pull request #9084 from jibees/9046-property-filter-on-shopfront
...
Fix an issue which prevented filtering by properties and sorting by category on a shopfront.
2022-04-22 11:03:31 +01:00
GeorgeThoppil
898c470c00
Change enterprise visibility scope
2022-04-21 20:27:28 -04:00
Filipe
4ea1dd68af
Merge pull request #9023 from apricot12/8908-Access-Enterprise-perms-from-setting-page
...
Enterprise can access permissions from enterprise edit page
2022-04-21 13:21:27 +01:00
Filipe
2ddc64ce4d
Merge pull request #9072 from mkllnk/remove-taxon-icons
...
Remove unused icons from Spree::Taxon
2022-04-21 11:46:57 +01:00
Jean-Baptiste Bellet
3e5656e638
Remove distinct to make proper ORDER BY
...
Update specs as well to test match array and test duplication by adding property2 to product1
2022-04-21 11:03:22 +02:00
Filipe
f516b7056d
Merge pull request #8863 from georgethoppil/payment-state-cancel-subscription-order
...
Setting payment state for subscription order
2022-04-20 13:14:57 +01:00
Filipe
1f6b5ef309
Merge pull request #8979 from jibees/6300-dont-submit-form-element-that-are-not-handled-by-backend
...
shipping fees on admin: avoid backend error when updating calculator type
2022-04-20 12:23:32 +01:00
Maikel
a145b97c28
Merge pull request #9103 from jibees/add-customer-id-to-order-endpoint-on-api
...
API: Add customer_id as an attribute to the GET /orders/ORDER_ID endpoint
2022-04-20 14:28:31 +10:00
Cillian O'Ruanaidh
4162830bee
Switch help modals from angular templates to use ViewComponent and StimulusJs
2022-04-20 09:36:30 +10:00
Jean-Baptiste Bellet
e607d5c161
Shipping method: disabled form element to not submit them
...
As they're not handled by the backend
2022-04-19 15:16:07 +02:00
Jean-Baptiste Bellet
a6c69c8530
Ensure that form element are well disabled to not submit them
...
As they're not handled by the backend
2022-04-19 14:28:18 +02:00
Filipe
4dde49c881
Merge pull request #8991 from jibees/8985-Make-checkbox-for-Send-a-cancellation-email-to-the-customer-checked-by-default
...
Admin, editing order, on last item deletion modal: "Send a cancellation email to the customer" checked by default
2022-04-18 14:04:08 +01:00
Filipe
f831154b6f
Merge pull request #8950 from jibees/5903-delete-coordinators_fees-linked-to-cloned-OC
...
Delete linked coordinators fees when deleting an order cycle
2022-04-18 11:55:53 +01:00
Filipe
01e915800e
Merge pull request #9037 from jibees/9028-last-item-of-order-cancellation
...
BOM: show custom modal on last item deletion of an order
2022-04-15 18:47:51 +01:00
Filipe
4009f3313f
Merge pull request #8814 from Matt-Yorkley/tom-select
...
Introduce new select/dropdown library
2022-04-15 18:08:08 +01:00
Filipe
54d64c1c2c
Merge pull request #8841 from apricot12/8790_display_stock_left_shop
...
Display remaining stock in shopfront if enabled in shop preferences
2022-04-15 17:58:40 +01:00
Jean-Baptiste Bellet
d38e14ca5c
Add customer_id as an attribute to order_detailed_serializer
...
Therefor customer_id will be available on the order object for `/api/v0/orders/[ORDER_ID].json` endpoint
2022-04-15 14:23:55 +02:00
Maikel Linke
2e989083bd
Remove unused icons from Spree:Taxon
...
The icons are not used any more and the default icon file never existed
in our code base (only in Spree when we depended on that).
And it's better to remove this clutter before migrating those files to
Active Storage.
We are keeping the icon files in storage as a backup. The whole folder
`/spree/taxons` can be deleted when desired. But storage is cheap.
2022-04-15 16:50:28 +10:00
Maikel Linke
ba1e21ad75
Feature-toggle API also per API key
...
We looked only at logged in users (session cookie) before.
2022-04-15 12:34:57 +10:00
Nihal Mohammed
15e7a5a4df
Rename product_stock_display to product_low_stock_display
...
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
2022-04-15 10:59:42 +10:00
Jean-Baptiste Bellet
1c68293cac
Display remaining stock for variant in the shopfront
...
Display only if all conditions are met:
- Variant is not a bulk buy
- Shop preference is true for `preferred_product_stock_display`
- Only 3 (or less) items are remaining in stock
- No item for this variant is already to cart
2022-04-15 10:53:28 +10:00
Jean-Baptiste Bellet
143c977a19
i18n for shop preferences
2022-04-15 10:53:28 +10:00
Nihal M. Kelanthodika
356d759dbe
Add Display stock option to enterprises form
2022-04-15 10:53:28 +10:00
Nihal M. Kelanthodika
f7a767988c
Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well)
2022-04-15 10:53:28 +10:00
GeorgeThoppil
8aa4631e21
Setting payment state for subscription order
2022-04-13 19:08:51 -04:00
Filipe
94bba56726
Merge pull request #9063 from georgethoppil/select-all-variants
...
Add all variants for only one distributor
2022-04-13 19:37:31 +01:00
Nihal Mohammed
d23846bfa2
Add Enterprise Settings to admin enterprises edit side menu, adds redirect_function to side menu services.
2022-04-13 17:03:04 +05:30
Maikel
a4bffc61f1
Merge pull request #8997 from apricot12/8968-Group-products-by-supplier-P1
...
Sort products by supplier in invoice
2022-04-13 11:54:12 +10:00
Maikel
26d6969b5b
Merge pull request #9045 from jibees/9043-send-email-cancelation-by-default
...
Send cancellation email by default when cancelling an order
2022-04-13 11:53:43 +10:00
Maikel
e6c65f524a
Merge pull request #9033 from seballot/select2-multiple
...
select2: improve style
2022-04-13 09:37:13 +10:00
Filipe
afcdfce37d
Merge pull request #8967 from mkllnk/api-customers-final
...
Serve customers data via first API v1 endpoint in JSON:API format behind feature toggle
2022-04-07 21:03:06 +01:00
Matt-Yorkley
7181694401
Include the little search icon for dropdowns with a search box
2022-04-05 18:56:52 +01:00
Matt-Yorkley
7753d9e1ea
Use TomSelect and dependent-select controller in admin order customer details form and remove ancient jQuery which uses global functions and inline scripts
...
🎉
2022-04-05 18:56:51 +01:00
Matt-Yorkley
be9156d40f
Refactor dependant-selector further and (conditionally) update TomSelect if present
...
I'm also introducing a convention here of adding a `private` comment to visually demarcate which methods are meant to be part of the public interface of the class and which aren't. The methods aren't *actually* private in any technical sense, it's just a bit of syntactic sugar to allow the intention to be communicated more clearly in the code's structure.
2022-04-05 18:56:51 +01:00
Matt-Yorkley
09bd7126d8
Replace/remove a custom select2 Angular directive
2022-04-05 18:56:51 +01:00
Matt-Yorkley
9bce2ca64c
Allow initializing with custom TomSelect configurations
2022-04-05 18:56:51 +01:00
Matt-Yorkley
fedfeb6dd3
Add dropdown "primary" style with blue instead of white
2022-04-05 18:56:51 +01:00
Matt-Yorkley
6459d9ea36
Replace some simple dropdowns
2022-04-05 18:56:51 +01:00
Matt-Yorkley
5e3e8c32c3
Create a simple Stimulus controller and add basic styling
2022-04-05 18:56:51 +01:00
GeorgeThoppil
706f6025e9
Add all variants for only one distributor
2022-04-04 19:59:42 -04:00
Filipe
f29dc3f978
Merge pull request #9009 from jibees/9007-already-opened-cart
...
SplitCheckout: add already opened cart message on summary step when distributor allow order changes
2022-04-01 13:29:34 +01:00
Filipe
c4fc8e9396
Merge pull request #8988 from jibees/8963-sc-display-save-shipping-address-as-default-checkbox
...
SplitCheckout: Display checkbox that "save as default address" on the /details page
2022-03-31 16:43:52 +01:00
Filipe
e2b1c0d93f
Merge pull request #9004 from jibees/8999-filter-shipping-methods-with-tag
...
SplitCheckout: filter shipping method with tag
2022-03-31 12:09:06 +01:00
filipefurtad0
843f57ad4f
Removes checkbox attributes
2022-03-29 22:29:43 +01:00
filipefurtad0
95b1911f38
Hides the default address checkbox for guest customers
2022-03-29 22:09:39 +01:00
Jean-Baptiste Bellet
6a48bdbb82
Send email cancelation by default
2022-03-29 10:12:00 +02:00
Filipe
729e9eda66
Merge pull request #9013 from cillian/fix-order-cycle-advanced-settings-close-button
...
Fix order cycle advanced settings close button so it uses new remote toggle StimulusJs controller instead of old toggleSettings method
2022-03-28 14:10:11 +01:00
Nihal Mohammed
b2613f3331
Add translations
2022-03-28 18:26:39 +05:30
Nihal Mohammed
5f2f5456a0
Add code to sort order by supplier when Enterprise user chooses to
2022-03-28 18:12:39 +05:30
Filipe
be1c255067
Merge pull request #8892 from Matt-Yorkley/spree-login-routes
...
Fix issue with unconfirmed email messages
2022-03-28 13:38:17 +01:00
