Nihal Mohammed
367cee593f
Move eager loading line_items to controller
2021-05-13 01:12:13 +05:30
Nihal Mohammed
fcf70c242e
edit item_count method to shorthand for improved readability
2021-05-09 18:31:26 +05:30
Nihal Mohammed
e485a4a8ef
Remove untested change to payments
2021-05-08 23:51:38 +05:30
Nihal Mohammed
026942dd72
Fix item_count to properly count quantity of every item
2021-05-08 23:45:41 +05:30
Nihal Mohammed
237ebd6ec4
Removed N+1 queries while counting line_items
2021-05-08 21:09:06 +05:30
Matt-Yorkley
1d29e277f2
Merge pull request #7493 from Matt-Yorkley/order-states-bug-redux
...
Reload order before updating in Payment callback
2021-04-27 17:43:34 +02:00
Matt-Yorkley
22f79fe540
Reload order before updating in Payment callback
2021-04-27 14:27:35 +01:00
Matt-Yorkley
574d78403d
Merge pull request #7433 from coopdevs/raise-on-failed-customer-creation
...
Notify Bugsnag if customer fails to be created
2021-04-27 12:42:39 +02:00
Pau Perez
ee01b0162c
Write if as a one-liner and avoid extra queries
2021-04-26 12:39:03 +02:00
Pau Perez
c65d82be01
Notify Bugsnag if customer fails to be created
...
This will hopefully let us see in Bugsnag when #6038 happens and so
we'll have all the diagnostics data. The fact that the `order.distributor`
is optional but mandatory to create the customer already gives us some
clue.
2021-04-26 10:15:12 +02:00
Andy Brett
6153f1c1b4
Merge pull request #7471 from Matt-Yorkley/dead-scopes
...
Order scopes
2021-04-25 11:51:00 -07:00
Andy Brett
6f20a23d47
Merge pull request #7436 from coopdevs/remove-duplicate-method
...
Replace duplicate #unauthorized method with module inclusion
2021-04-25 11:26:12 -07:00
Pau Perez
e5eb68dffc
Replace duplicate method with module inclusion
...
No reason to risk diverging their implementations. They are exact
copies.
Likewise, there's no need to have to I18n keys with almost the same
content.
2021-04-23 12:03:11 +02:00
Matt-Yorkley
4938285dd7
Move order query methods to chainable scopes
2021-04-23 10:29:48 +01:00
Matt-Yorkley
caee2eb3e9
Remove dead code in order
...
These aren't used anywhere
2021-04-23 10:23:40 +01:00
Pau Pérez Fabregat
cf2e3db645
Merge pull request #7445 from jibees/7403-add-customer-name-into-subscriptions-table
...
Add customer name into subscriptions list in order to search subscription by customer name
2021-04-22 19:46:49 +02:00
Pau Pérez Fabregat
c1da97527a
Merge pull request #7420 from Matt-Yorkley/adjustments-controller
...
Adjustments controller index
2021-04-22 19:15:28 +02:00
Matt-Yorkley
123e96eb1e
Merge pull request #7284 from jibees/styleguide
...
Implements our StyleGuide
2021-04-22 18:14:40 +02:00
Matt-Yorkley
bef3f8c51f
Merge pull request #7452 from Matt-Yorkley/adjustments-permissions
...
Update CanCan permissions on adjustments
2021-04-22 18:07:18 +02:00
Jean-Baptiste Bellet
9a670c7821
Print order needs render_with_wicked_pdf
...
and call WickedPdf::PdfHelper explicitly
2021-04-22 15:18:27 +02:00
Jean-Baptiste Bellet
de592de13a
Use the first view component DistributorTitleComponent for a shopfront
2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet
4781d6cc84
Add new (and first) component: DistributorTitle
...
- Simple wrapper around `<h3 />` for distributor title, used in the shop front
2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet
57e5214217
Call WickedPdf::PdfHelper#render_to_string_with_wicked_pdf explicitly
2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet
6c37461c37
Create very first component
...
- With command: `rails generate component Example title --sidecar`
- Delete generated spec file
2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet
259e758d6e
When suppress_error_msg is present do no validate order and redirect
...
- When creating a new order, it's not necessary to display the "Line items can't be blank" as the order has just been created and the user is rightly doing configuration about line items
2021-04-22 10:03:36 +02:00
Matt-Yorkley
6dc23804a1
Merge pull request #7425 from mkllnk/application-record
...
Add ApplicationRecord for customisations of models
2021-04-21 23:18:03 +02:00
Matt-Yorkley
ecd433b343
Update permissions on adjustments
...
The previous permissions assumed that an adjustment's "adjustable" could only be only line items or orders, and that's no longer true. It's now commonly a shipment or a payment as well.
2021-04-21 18:17:20 +01:00
Andy Brett
479897fcbd
Merge pull request #7315 from Matt-Yorkley/double-checkout
...
Double checkout
2021-04-20 10:44:32 -07:00
Andy Brett
883cc6f96f
Merge pull request #7428 from jibees/7426-show-unit-price-in-the-bulk-modal
...
Show unit price in the bulk buy modal
2021-04-20 10:43:28 -07:00
Jean-Baptiste Bellet
ddb63dff8a
Add name of the customers into subscriptions table
...
- Thus, we can filter subscriptions by customer email
2021-04-20 16:09:48 +02:00
Pau Pérez Fabregat
87624f4c9f
Merge pull request #7416 from coopdevs/remove-old-balance-implementation
...
Remove old balance implementation
2021-04-20 08:51:27 +02:00
Andy Brett
aca19edd3b
Merge pull request #7421 from andrewpbrett/rails-5-2-prep-2
...
Prepare for Rails 5.2
2021-04-19 11:32:21 -07:00
Pau Perez
d26c52c2fa
Memoize OrderBalance instance
...
There's no need to create an instance of such class for every call to
one of its methods. The balance is computed each time anyway, so it'll
always be up-to-date.
2021-04-19 11:52:41 +02:00
Pau Perez
5bca7d1f8f
Remove the old balance's code branch
...
This keeps the `OrderBalance` abstraction but removes the old code now
that the feature is enabled for all users in all instances and there are
no bugs reported. It's become dead code.
2021-04-19 11:52:41 +02:00
Pau Perez
5087ca709a
Make method stick to Boolean instead of Nil
2021-04-16 13:23:56 +02:00
Pau Perez
e30ddf3f77
Test and simplify #require_customer?
2021-04-16 13:08:42 +02:00
Jean-Baptiste Bellet
8b3a178d97
Increase zIndex of the tooltip as it's now displayed inside modal
...
specify zIndex by using vars from modal zIndex
2021-04-16 11:09:26 +02:00
Jean-Baptiste Bellet
e0987c52ed
Add unit price information into the bulk buy modal
...
- Pass a parameter to scope: showunitprice and display unit price information if it's true
2021-04-16 11:09:05 +02:00
Jean-Baptiste Bellet
f9aab2ef5f
Adjust little cross inside blue circle to close tooltip
2021-04-16 11:08:57 +02:00
Andy Brett
472b0b5964
Merge pull request #7412 from andrewpbrett/no-zero-unit-values
...
Add greater-than-zero validation to variant unit_value
2021-04-15 10:05:38 -07:00
Andy Brett
c0bd8f0248
Merge pull request #7419 from Matt-Yorkley/adjustments-display
...
Don't show duplicate adjustments in order edit
2021-04-15 09:49:38 -07:00
Andy Brett
94ca2f3079
add validation to variant unit_value
2021-04-15 09:43:22 -07:00
Pau Pérez Fabregat
5ddccc79ae
Merge pull request #7404 from jibees/7180-variant-unit-scale-field-invalid-when-editing-a-product
...
Fix Variant Unit Scale field initialization in Edit Product form
2021-04-15 18:20:31 +02:00
Matt-Yorkley
d29c0cdcb7
Don't show line item adjustments in Admin::OrdersHelper#order_adjustments_for_display
...
Line item adjustments are displayed separately, if we don't filter them here they get displayed twice.
2021-04-15 14:23:37 +01:00
Matt-Yorkley
206d9e06ea
Reinstate old logic for adjustments controller
...
Certain types of adjustments (eg enterprise fees) cannot really be changed arbitrarily; when the order is saved and "recalculated" the values will be reset. The adjustments are still shown in the main order edit tab, but are not editable in the adjustments tab.
2021-04-15 14:00:48 +01:00
Matt-Yorkley
50da77c6db
Hide tax rate selection when editing non-admin adjustments
2021-04-15 13:59:05 +01:00
Maikel Linke
5c0cdce597
Confine Permalinks patch to application
...
We were also patching ActiveRecord::Relation for the `#find_by_param`
methods but we are not using those any more. They were deprecated a
while ago. We now use `find_by(permalink: ...)`.
2021-04-15 15:59:03 +10:00
Maikel Linke
125374c488
Confine Preferences patch to our app
2021-04-15 15:59:03 +10:00
Maikel Linke
1893313c40
Confine DelegateBelongsTo patch to our app
2021-04-15 15:59:03 +10:00
Maikel Linke
1364b878fe
Add ApplicationRecord for customisations
...
Rails 5 introduced this new class to confine application-specific monkey
patches to our models only, and not leak into other libraries using
ActiveRecord::Base.
https://bigbinary.com/blog/application-record-in-rails-5
2021-04-15 15:59:03 +10:00
