Jean-Baptiste Bellet
bf40e59bec
Should link to order.distributor website
...
- order: the order summary the customer is seeing on this page
- current_order: the order is the customer is check-outing
+ add specs
2022-06-13 14:52:20 +02:00
Filipe
9fee4f1554
Merge pull request #9203 from AgriculturaFamiliar/remove-closed-associated-adjustments-button
...
Remove closed associated adjustments button
2022-06-10 10:10:50 +01:00
jibees
0ed99c5ebd
Merge pull request #9132 from jibees/8540-handle-items-in-bulk-order-management-page
...
Handle `items` in bulk order management
2022-06-10 10:08:14 +02:00
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
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
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
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
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
Diego de Araújo Martinez Camarinha
8a62d95c48
Select all text upon focus on map search input for Google Maps
...
On the map page, when we search a location and than want to search for
another, we would have to delete letter by letter of the previous search
text.
Now, when we click on the search input to type another search text, the
previous text will be all selected and we can remove everything with
just hitting the backspace once
2022-05-20 11:06:34 -03:00
Rachel Arnould
8779ef6b77
Merge pull request #9187 from jibees/9052-add-phone-number-to-alternative-invoice
...
Add phone number and email address to alternative invoice
2022-05-18 18:59:04 +02:00
Rachel Arnould
5dfc3c7a62
Merge pull request #9151 from jibees/9140-fill-all-the-input-when-selecting-a-customer
...
When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form
2022-05-18 17:41:59 +02:00
georgethoppil
a37f54e4b3
Find subscriptions in schedule to recalculate nil estimate price
2022-05-17 20:58:25 -04:00
georgethoppil
03b24bfc38
Destroy all adjustments on cart empty
2022-05-17 20:21:47 -04:00
Jean-Baptiste Bellet
d28545a7b2
Display both phone number and email to the alternative invoice
2022-05-17 12:10:41 +02:00
Jean-Baptiste Bellet
0b71f7298e
Remove JSON as a download option
2022-05-17 10:47:19 +02:00
Sebastian Castro
0218f75f34
Packing Report: hide by default phone and price column to avoid breaking changes
2022-05-12 16:54:14 +02:00
Sebastian Castro
767afe1fba
Reports Renderer: whitelist report formats
2022-05-12 16:54:14 +02:00
Sebastian Castro
8a943f50ef
Reports: Format cells for html, pdf, and spreadsheet
...
Currency, number format, dates
2022-05-12 16:54:14 +02:00
Sebastian Castro
3b01c44eae
Reports: Improve Exports
...
Improve PDF style and encoding
Include header_row and summary_row, except for CSV and JSON
Style spreadsheets
Use only Xlsx no more Ods format
2022-05-12 16:54:14 +02:00
Sebastian Castro
5105ea345f
Reports Refactor 4: Final Touch
...
Split report_template
Clean code
Adds spec
2022-05-12 16:54:14 +02:00
Sebastian Castro
eeb525aedb
Reports: Ability to hide columns
2022-05-12 16:54:14 +02:00
Sebastian Castro
9874c7996e
Reports: Adds Print Button
2022-05-12 16:54:14 +02:00
Sebastian Castro
c7c5965eb5
Report Refactor 3 Clean
...
No longer need to handle old report class
Remove no longer used OrderGrouper service
sq
2022-05-12 16:54:14 +02:00
Sebastian Castro
cd30012334
Report Refactor 3: Xero Invoices
...
This one as actually not really been refactored, too much work to rewrite it so I just encapsulated the result within the new methods definitions
2022-05-12 16:54:14 +02:00
Sebastian Castro
71aca960ee
Report Refactor 3: Order Cycle Management
2022-05-12 16:54:13 +02:00
Sebastian Castro
287e8f5845
Reports Refactor 3
...
Easily group and create header and summary row
Auto format cells when appropriate type (boolean, dates) and render_format (neither csv nor json)
2022-05-12 16:54:13 +02:00
Sebastian Castro
452a3fa933
Reports Refactor 2: Merge Spree::reports into Admin::Reports
2022-05-12 16:54:13 +02:00
Sebastian Castro
288a35f062
Reports Refactor 2: New templates abstract classes
2022-05-12 16:54:13 +02:00
