Luis Ramos
e0ea25b7a3
track_inventory_levels is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
8f19ad0646
Delete dead code
2020-09-01 09:42:24 +01:00
Luis Ramos
e89eb8f76c
Fix simepl rubocop issues
2020-09-01 09:42:24 +01:00
Luis Ramos
0b053c18af
Merge decoorator with original file from spree
2020-09-01 09:42:24 +01:00
Luis Ramos
d13bd86e4c
Bring stocck movement and stock location from spree
2020-09-01 09:42:24 +01:00
Arun Kumar Mohan
bf07da6267
Fix the order resend message translation
2020-08-29 20:47:28 -05:00
Arun Kumar Mohan
bb9ab57699
Remove resend button on the orders edit page
2020-08-29 20:47:28 -05:00
Pau Pérez Fabregat
4984cc9758
Merge branch 'master' into ctry_zone
2020-08-28 09:21:57 +02:00
Maikel
819a445547
Merge pull request #5712 from mbudm/issue/5208
...
Add payment details to invoice
2020-08-28 09:46:49 +10:00
Maikel
d57f20a542
Merge pull request #4925 from luisramos0/finders
...
Adapt remaining AR finders to rails 4
2020-08-28 09:46:20 +10:00
Pau Pérez Fabregat
06b41a8236
Merge pull request #5908 from Matt-Yorkley/subs-logging
...
Improve subs logging
2020-08-27 16:23:15 +02:00
Pau Pérez Fabregat
2fa8cd54fd
Merge pull request #5769 from Matt-Yorkley/customer-names
...
Customer names in reports
2020-08-27 15:39:47 +02:00
Pau Pérez Fabregat
300e12371a
Merge pull request #5918 from luisramos0/stripe_disabled
...
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-27 13:27:40 +02:00
Maikel
7ce9a3f988
Merge pull request #5894 from julesemmac/places-error
...
adding required argument to resolve Places error
2020-08-27 11:01:19 +10:00
Maikel
7a0b036edd
Merge pull request #5899 from andrewpbrett/dashboard-link
...
Update dashboard link to point to enterprise shop
2020-08-27 10:53:43 +10:00
Maikel
d81ed36eef
Merge pull request #5892 from arku/fix/price-i18n
...
Fix price translation in Bulk Order Management
2020-08-27 10:31:38 +10:00
Luis Ramos
5b3e350204
Rename zone.country_list to zone.countries
2020-08-26 23:12:48 +01:00
Luis Ramos
53de04121c
Fix rubocop issue
2020-08-26 23:09:41 +01:00
Luis Ramos
9264badaaf
Merge pull request #5879 from luisramos0/payments
...
[Bye bye Spree] Bring models payment_method, credit_card and gateway from spree_core
2020-08-26 22:09:16 +01:00
Pau Pérez Fabregat
0421d23e7b
Merge pull request #5851 from cillian/osm-tile-provider-updates
...
Open Street Map tile provider updates
2020-08-25 10:51:55 +02:00
Maikel
cad79d74c8
Merge pull request #5696 from jeduardo824/enhancement/5210-action-buttons-on-all-tabs
...
Enhancement/5210 - Add Actions dropdown menu to all pages of Order Details menu
2020-08-25 15:39:50 +10:00
Luis Ramos
e616e32bbc
Merge pull request #5931 from Matt-Yorkley/customer-totals-fees
...
Customer totals fee calculations
2020-08-21 14:09:00 +01:00
Luis Ramos
19b5a004dd
Merge pull request #5877 from Matt-Yorkley/bugsnagger
...
BugsnagJS checkout errors
2020-08-21 14:01:48 +01:00
Luis Ramos
4a5a6a2242
Merge pull request #5906 from Matt-Yorkley/checkout_flash_errors
...
Fix flash error issues in checkout requests
2020-08-21 13:03:30 +01:00
Luis Ramos
d1b60e3778
Merge pull request #5905 from mkllnk/lost-decorators
...
Load previously lost decorator code and don't delete orders
2020-08-21 12:34:37 +01:00
Matt-Yorkley
2f1fdc5852
Simplify conditional statement
2020-08-21 12:12:30 +01:00
Maikel
0309a20cb1
Merge pull request #5904 from Matt-Yorkley/favicon
...
Fix broken favicon path
2020-08-21 14:05:00 +10:00
Matt-Yorkley
07b819ab4b
Adjust payment state conditional
...
The `Spree::Order#paid?` method actually includes orders with `payment_state == "credit_owed"`, which was breaking the desired display logic here.
2020-08-20 17:16:20 +01:00
Steve Roberts
50fd3656ef
Fix tests - the move of payments to shared has wider impact than first thought (yay tests)
2020-08-20 17:16:20 +01:00
Steve Roberts
4243ff293f
Update invoice2 to also use the shared payment partial
2020-08-20 17:16:20 +01:00
Steve Roberts
c79f2326fc
Fix some more issues raised by semaphore
2020-08-20 17:16:20 +01:00
Steve Roberts
ac69bef459
Fix issues raised by linter
2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361
Modify payment_list partial to be shared
...
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
2020-08-20 17:16:20 +01:00
Steve Roberts
1f470830c8
add vars to email.scss
2020-08-20 17:16:20 +01:00
Steve Roberts
a00e964eb6
Clean up scss - picked up by codeclimate
2020-08-20 17:16:20 +01:00
Steve Roberts
8e5cfdeb97
Add more details on payments to invoice.
2020-08-20 17:16:20 +01:00
Matt-Yorkley
3badaa07d2
Fix adjustment calculations; only "eligible" adjustments should be regarded as applied to an order.
...
When an order is submitted and the payment fails, the failed payment's adjustments (payment fees) are set to `eligible: false` to indicate they do not apply. These should not be counted as being included in an order's adjustments.
2020-08-19 22:50:37 +01:00
Luis Ramos
d6160b5759
Merge pull request #5758 from luisramos0/order_updater
...
Bring Order Updater from spree_core
2020-08-19 20:47:27 +01:00
Luis Ramos
40d4ed2c95
Merge pull request #5733 from luisramos0/base_ctrl
...
Move lib/spree to OFN
2020-08-19 18:35:17 +01:00
Maikel Linke
bb3f958dd2
Remove redundant includes
2020-08-19 10:37:18 +10:00
Luis Ramos
d1ef0e0a0b
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-18 16:41:29 +01:00
Matt-Yorkley
ed346b3b54
Add scrolling animate on sidebar hide
2020-08-17 13:41:06 +01:00
Matt-Yorkley
290120d015
Fix broken favicon path
...
Ensures the non-fingerprinted version of the favicon will be used directly from `/public/favicon.ico`. Needed after recent changes to the Rails asset pipeline.
2020-08-17 11:59:22 +01:00
Matt-Yorkley
0fd163602d
Rename method for clarity
2020-08-17 11:17:42 +01:00
Luis Ramos
f8146fb946
Adapt finders to rails 4
2020-08-16 16:50:54 +01:00
Matt-Yorkley
91789494b0
Fix error: Unpermitted attribute: order_cycle_ids
2020-08-15 17:03:19 +01:00
Matt-Yorkley
2eda8789d1
Add user id logging to OrderCycle an Schedule PaperTrail entries
2020-08-15 14:49:08 +01:00
Matt-Yorkley
5f8fc64b31
Move layout adjustment from view to CSS
2020-08-15 12:18:41 +01:00
Matt-Yorkley
102df28e97
Extract data masking to service
2020-08-14 20:48:33 +01:00
Matt-Yorkley
0b91991919
Add explanatory user message for viewing customer names
2020-08-14 20:48:33 +01:00
