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
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
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
Nihal M. Kelanthodika
9215ccc353
Prevents creation of payment adnustment when refunding or crediting an order
2022-02-15 11:52:26 +00:00
Matt-Yorkley
e5818955ff
Invalidate all incomplete payments when creating a new one, not just those in "checkout" state.
...
Looking at prod data; when a checkout submission fails due to something like a card being out of date, the payment's state seems to be "pending" and not "checkout", which means this mechanism fro invalidating old payments is potentially not working where it should.
2022-02-11 17:25:27 +00:00
Filipe
6e2c4a385a
Merge pull request #8810 from Matt-Yorkley/split-checkout-tax
...
Reduce expensive tax recalculation calls
2022-02-10 17:42:39 +00:00
Jean-Baptiste Bellet
50f547af98
Add an attribute that conditions the sending of the cancellation email
...
true by default to not change the default behavior.
Can be set to false when sending params send_cancellation_email
2022-02-10 14:39:00 +01:00
Filipe
30c1d89525
Merge pull request #8822 from Matt-Yorkley/split-checkout-payment-total
...
[Split Checkout] Move setting of payment total during checkout into OrderUpdater
2022-02-09 16:21:47 +00:00
Maikel Linke
572a65b324
Create a scope to retrieve product based on its properties
...
both inherited and own product properties
Update the product spec to test the scope that concern properties
2022-02-07 08:57:18 +01:00
Matt-Yorkley
35392cb117
Remove Order#set_payment_amount!
2022-02-01 11:39:07 +00:00
Filipe
8d18279f53
Merge pull request #8784 from apricot12/7398-Weight_field-on-non-weight-variants
...
Convert variant.weight into decimal if integer or 0.0 if nil
2022-01-31 18:55:31 +00:00
Matt-Yorkley
448e4bb67b
Reduce expensive tax recalculation calls
...
This can only really be enabled once we've merged the split checkout
2022-01-29 18:56:52 +00:00
Nihal M. Kelanthodika
23a7ba2479
Added before_save callback to convert variant weight to decimal and 0.0 if nil
2022-01-27 16:33:14 +05:30
Filipe
374c05116b
Merge pull request #8726 from Matt-Yorkley/stringex-machina
...
Reduce impact of stringex gem
2022-01-26 19:02:41 +00:00
