Philipp Winkler
bf53a02270
Add api key toggle view checkbox
2022-08-07 09:48:49 +02:00
Maikel Linke
b419f063dc
Support WEBP images again
...
We introduced a list of formats we support and forgot to add webp. Now I
added that as allowed format again and modified the error message.
I removed the first sentence from the error message because it's very
similar to the default error which is shown as well.
2022-07-26 11:09:41 +10:00
jibees
20ee0d5009
Merge pull request #9301 from mkllnk/3975-unsupported-image
...
Allow SVG images for products and show errors when uploading unsupported file
2022-07-21 16:56:11 +02:00
Jean-Baptiste Bellet
2b67a0fa80
Specify a list of content-types
...
Then remove specific image format that aren't handled by a web browser (such as `image/x+xcf)`
+ List allowed image formats for enterprises and groups
2022-07-21 08:42:17 +02:00
Filipe
e91a87d83b
Merge pull request #9295 from filipefurtad0/destroy_order_state_confirmation
...
Restarts checkout flow, when emptying the cart
2022-07-07 22:47:44 +01:00
Filipe
899a796896
Merge pull request #9348 from jibees/9315-add-boolean-to-set-enterprise-phone-number-mandatory-or-not
...
Add boolean to specify if enterprise number (ABN, GST, SIRET, ...) is mandatory or not to generate invoices
2022-06-29 19:07:55 +01:00
Jean-Baptiste Bellet
3a1fde40c5
Add a Spree config option: enterprise_number_required_on_invoices
2022-06-28 09:50:12 +02:00
Filipe
45214ed923
Merge pull request #9325 from jibees/8899-shopfront-display-fee-name-in-the-tooltip-of-a-price-product-
...
In the shopfront, display fee name in the tooltip of a price product breakdown
2022-06-24 20:49:32 +01:00
Filipe
b977bc77c8
Merge pull request #9272 from jibees/7905-retrieve-order-already-placed-on-user-confirmation-with-customer-email
...
On user confirmation, retrieve and link all orders to the new user that were already placed with the same email
2022-06-21 18:12:58 +01:00
Jean-Baptiste Bellet
3c05fc3c80
Add fees name for a variant to its serializer
2022-06-21 14:42:22 +02:00
François Turbelin
76ea7089d9
Implement suggestions
2022-06-21 10:08:12 +02:00
François Turbelin
39a6b5d20f
Add disabled_at logic on spree users
2022-06-21 10:08:12 +02:00
Jean-Baptiste Bellet
bc43028cb1
On User confirmation, link all already placed orders to this new user
...
if user.email == customer.email
Co-Authored-By: Maikel <maikel@email.org.au >
2022-06-20 15:39:22 +02:00
filipefurtad0
9ab672d0b1
Restarts checkout flow for state 'confirmation'
2022-06-15 10:35:40 +01:00
Maikel Linke
004c7eef9e
Show SVG product images
2022-06-14 15:35:55 +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
4a15ed9b39
Merge pull request #9190 from georgethoppil/duplicate-transaction-fees
...
Destroy all adjustments on cart empty
2022-06-02 11:36:27 +01:00
Maikel Linke
b7efa1b018
Replace Paperclip on Spree::Image
2022-06-01 17:16:55 +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
georgethoppil
ec7d4b7c21
Restart checkout flow on cart empty if state of checkout is payment
2022-05-23 11:41:10 -04:00
georgethoppil
03b24bfc38
Destroy all adjustments on cart empty
2022-05-17 20:21:47 -04:00
Sebastian Castro
71aca960ee
Report Refactor 3: Order Cycle Management
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
GeorgeThoppil
8903496a1b
Optional restocking items
2022-05-06 10:55:24 -04:00
Maikel Linke
9dc3c5a06c
Add task for ContentConfig image migration
2022-04-25 13:00:31 +10:00
Maikel Linke
c36ad96acc
Move file duplication code to concern to share
...
I chose `has_one_migrating` as method name for two reasons:
1. It reflects Active Storage's method `has_one_attached`.
2. And it has the same length as Paperclip's `has_attached_file`.
Therefore the commits don't need any whitespace changes.
When we change it to `has_one_attached`, we will also remove the
Paperclip options which then don't need whitespace changes either.
2022-04-25 13:00:31 +10:00
Maikel Linke
ec64e5c8f7
Store images with Active Storage as well
...
While we migrate from Paperclip to Active Storage, we need to use both
at the same time to avoid any downtime or lost images.
Once the migration is complete, we want to use the same name for
attachment as before. Using Paperclip and Active Storage at the same
time creates a name conflict on a couple of methods.
I'm using alias_method as a temporary solution to access Active Storage
methods. We will remove that after the migration. I declare Paperclip
afterwards so that we have those methods declarations for backwards
compatibility now.
2022-04-25 13:00:31 +10:00
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
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
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
GeorgeThoppil
8aa4631e21
Setting payment state for subscription order
2022-04-13 19:08:51 -04:00
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
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
Matt-Yorkley
ad5c834342
Merge pull request #8995 from apricot12/7853-deprecation-warnings-1
...
7853 deprecation warnings 1
2022-03-25 19:54:06 +00:00
Nihal Mohammed
ad52805a0d
Change errors to be accessed by a block with single paramter instead of hash
2022-03-15 05:35:22 +05:30
jibees
d4a4a36b14
Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion
...
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
2022-03-11 08:56:41 +01:00
Filipe
6ce29f81d8
Merge pull request #8920 from apricot12/Remove_checkout_only_option_from_payment_methods_display
...
Remove checkout only option from payment methods edit form.
2022-03-10 14:38:45 +00:00
Nihal Mohammed
e2bdc69a90
Update available_payment_methods method in enterprises_helper and order model
2022-03-07 17:33:09 +05:30
Nihal Mohammed
3820d4c591
Removed checkout only from DISPLAY options on payment method edit form and updated payment_method_spec
2022-03-07 17:33:09 +05:30
Maikel Linke
b999673dfc
Remove old version of relaxed styled guide
...
We had an old version under "contested settings" and it looks like some
of them were modified. I hope that our new, separate file will
discourage manual tweaks.
We can include the relaxed rules from a gem as well. Let's see if we
need that complexity one day.
2022-02-25 10:51:54 +11:00
Maikel Linke
1d15f35522
Remove now unnecessary inline rubocop config
2022-02-25 10:46:51 +11:00
Filipe
dbf5eb76f8
Merge pull request #8689 from apricot12/Transaction_fee_when_crediting
...
Revoke transaction fee if there is an amount to be credited in order
2022-02-21 20:30:19 +00:00
Filipe
7590b3ecf8
Merge pull request #8756 from jibees/8075-take-into-account-the-inherits_properties-attribute
...
Product that don't inherits from "producer"/"enterprise" properties should be filtered out by user on shop page
2022-02-21 19:04:08 +00:00
Maikel Linke
d09ba16411
Associate customers again
...
And simplify the before_validation actions.
2022-02-16 10:23:23 +11:00
François Turbelin
554a8625e5
Refactor ensure_customer method
2022-02-16 10:23:23 +11:00
François Turbelin
4cb31d04a7
Repair specs with default values on ensure_customer method
2022-02-16 10:23:23 +11:00
Adrien Chauve
5ca4d549e7
Update customer creation
2022-02-16 10:23:22 +11:00
Matt-Yorkley
8084ad0068
Extract a comment-method so the code conveys it's purpose
2022-02-15 12:17:08 +00:00
