jibees
e1fc4accab
Merge pull request #9288 from mkllnk/9279-image-order-display
...
Show order and admin page despite broken image
2022-06-10 10:01:27 +02:00
Rachel Arnould
834bf04185
Merge pull request #9286 from jibees/9281-invoice-print-failed-when-enterprise-having-a-logo
...
Admin, print an invoice with alternative mode: fix an issue when enterprise has a logo
2022-06-10 10:00:40 +02:00
Maikel Linke
bec2a873de
Show order and admin page despite broken image
...
Avoiding:
ActiveStorage::InvariableError
Affects the admin order page and the customer's order confirmation page.
2022-06-10 15:35:21 +10:00
Jean-Baptiste Bellet
2e0851c02f
Use the method logo_url
2022-06-09 14:15:41 +02:00
Maikel Linke
dd659f16c0
Correct method name for shop logo in email
2022-06-09 16:00:57 +10:00
Filipe
43888f7f3c
Merge pull request #9126 from mkllnk/active-storage
...
[Breaking] Replace Paperclip with Active Storage
2022-06-07 11:14:39 +01:00
Filipe
4a2fd10bdb
Merge pull request #9237 from mgrigoriev8109/bug/update-tracking-font
...
Fix shipped email tracking information font size
2022-06-02 18:37:27 +01:00
Filipe
1a2c1d004c
Merge pull request #9239 from kvaithin/9233-spacing-between-btns
...
Add spacing between coordinator dropdown and continue button
2022-06-02 18:35:08 +01:00
Filipe
6ff2d4a9d5
Merge pull request #9109 from apricot12/8917-Link-to-enterprise-site
...
Adding a link to enterprise's own site from Order confirmation page.
2022-06-02 17:59:03 +01:00
Filipe
b3d81154e6
Merge pull request #9174 from georgethoppil/nan-items-subscription
...
Updating order cycle will ensure any $NaN subscription item prices to be recalculated
2022-06-02 17:28:54 +01:00
Jean-Baptiste Bellet
68bd1df312
Handle rename with context menu on the first taxon ie. the root one
...
Also rename the main input field (sort of title) when updating the root taxon name with contextual menu
2022-06-02 16:03:16 +02:00
Jean-Baptiste Bellet
4bbbae68c7
Do not send parent_id is it's something else than a number
...
When moving element on top, `new_parent.attr("id")` was `taxonomy_tree` which was causing DB error
2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
817b5f437f
Authorize :position params
2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
121c9eed3b
Replace Spree.url().clone() by new URL()
2022-06-02 15:41:44 +02:00
Filipe
4a15ed9b39
Merge pull request #9190 from georgethoppil/duplicate-transaction-fees
...
Destroy all adjustments on cart empty
2022-06-02 11:36:27 +01:00
Arthur
05c8414e0d
Merge branch 'openfoodfoundation:master' into remove-closed-associated-adjustments-button
2022-06-01 16:03:43 -03:00
Maikel Linke
4facab0335
Guard against invariable file types
...
Australian production had one JPG image which was not recognised as
such. The `content_type` was missing and trying to generate a URL for a
variant raised an error and crashed the page.
Testing for `variable?` includes testing for `attached?` and is more
defensive.
2022-06-01 17:16:55 +10:00
Maikel Linke
86731d7e30
Remove compatibility code for migrating files
...
The migration should be complete now.
2022-06-01 17:16:55 +10:00
Maikel Linke
b7efa1b018
Replace Paperclip on Spree::Image
2022-06-01 17:16:55 +10:00
Maikel Linke
4a0ed99919
Replace Paperclip on Enterprise model
...
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.
Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
2022-06-01 17:16:55 +10:00
Maikel Linke
45995ac984
Replace Paperclip on EnterpriseGroup
2022-06-01 17:16:55 +10:00
Maikel Linke
421ffae78c
Replace Paperclip on TermsOfServeFile
2022-06-01 17:16:54 +10:00
Maikel Linke
727eef3c4f
Replace Paperclippable ContentConfig
...
The old Paperclip configuration was very clever and easy to use but it
was also a complicated implementation building on the complicated Spree
preference system.
I simplified this with Active Storage, storing simple references to blob
ids and default URLs as backup.
2022-06-01 17:16:54 +10:00
Mikhail Grigoriev
b169f1baf1
Fix shipped email's tracking information font size using p.lead
2022-05-31 14:39:02 -04:00
Jean-Baptiste Bellet
78c2f76a3f
Introduce FeatureToggle for columns logic
...
relative to a46416a98
2022-05-31 15:57:39 +02:00
Jean-Baptiste Bellet
8fec5f1464
Use mixins useRenderCustomer
2022-05-31 09:00:24 +02:00
Jean-Baptiste Bellet
39b7f56e6d
Use mixins useSearchCustomer
...
Prefer composition vs. inheritance
2022-05-31 08:57:11 +02:00
Maikel
8645277a05
Merge pull request #9204 from AgriculturaFamiliar/8755-fix-search-input
...
Select all text upon focus on map search input for Google Maps
2022-05-31 10:57:02 +10:00
Maikel
f3d9b3d7ed
Merge pull request #9157 from jibees/SC-sort-shipping-methods-case-insenstive
...
Split Checkout: Sort shipping methods case insensitive
2022-05-31 10:54:43 +10:00
Jean-Baptiste Bellet
a46416a98e
Change UX to transform from fields_to_hide to fields_to_show
...
Fill `params[:fields_to_show]` with its default value
2022-05-30 15:34:08 +02:00
Jean-Baptiste Bellet
454e4a4100
Initialize on_demand checkbox value
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
70baccd76c
Create a method to handle redirect after save
...
and the get rid of rubocop linter error
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
72ce2e5598
Initialize display_as
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
df1b126852
Initialize unit_value_with_description
...
+ Specify to empty field since its now filled with default value `1.0`
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
134202bedd
Initialize value for variant_unit_with_scale
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
f6981e4320
Initialize value with ng-model: product.description
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
c78e734dee
Initialize with submitted value on_hand
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
be0065ad1a
Initialize value with @product.price
...
Co-Authored-By: Maikel <maikel@email.org.au >
2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
68f8413cda
Remplace collection_select by select and fill the selected item
...
+ add tom-select controller
2022-05-30 14:54:47 +02:00
kvaithin
ad0effc565
spacing between co ordinator dropdown and continue btn
2022-05-28 11:13:16 +01:00
Arthur Vieira
95010fcd12
Remove the unlock condition in shipment controller
...
This assumes unlock is always true so the shipment's fee adjustments
always opens and closes.
2022-05-26 09:21:48 -03:00
Arthur Vieira
0fb9cc0f2a
Remove associated adjustments radio button
...
Removes the 'Associated Adjustment Closed' options from the order edit
page (/admin/orders/XXXXX/edit).
2022-05-26 09:12:19 -03:00
Jean-Baptiste Bellet
760de3b507
Do not set null value to select controller
2022-05-24 12:35:23 +02:00
Jean-Baptiste Bellet
5e27795a15
Special method to handle customer with no bill_address
2022-05-24 12:30:11 +02:00
Jean-Baptiste Bellet
2c29b1f60f
Replace Angular directive and use stimulus controller
...
+ Update specs as well
2022-05-24 12:30:00 +02:00
Jean-Baptiste Bellet
ce058c6e36
Create a SelectCustomer controller
...
To be used in `/admin/orders/ORDER_ID/customer` page
- Fetch `/admin/search/customers.json?` with query as params
- Render each items response thanks to `renderOption()` method
- `onItemSelect()` is here to fill the associated form in the page
2022-05-24 12:30:00 +02:00
Jean-Baptiste Bellet
5018f824f5
Prepare tom-select controller to inherit others controllers
2022-05-24 12:30:00 +02:00
Jean-Baptiste Bellet
68cb8d9965
Formatting file
2022-05-24 12:30:00 +02:00
jibees
641df45fcd
Revert "When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form"
2022-05-24 09:50:18 +02:00
georgethoppil
ec7d4b7c21
Restart checkout flow on cart empty if state of checkout is payment
2022-05-23 11:41:10 -04:00
