Luis Ramos
|
3ebc8145df
|
Avoid calling update with nil values
|
2020-11-27 13:59:46 +00:00 |
|
Matt-Yorkley
|
3bfa903912
|
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
|
2020-11-27 14:11:57 +01:00 |
|
Andy Brett
|
85d99f3bf2
|
Merge branch 'master' into controllers
|
2020-11-20 08:12:03 -08:00 |
|
Matt-Yorkley
|
0b18b0dc0a
|
Include Calculator attributes in PaymentMethod nested attributes and DRY repeated code
|
2020-11-17 19:04:26 +00:00 |
|
Matt-Yorkley
|
36f4f40e84
|
Refactor and fix PaymentMethod strong params
|
2020-11-17 18:51:48 +00:00 |
|
Andy Brett
|
17202ff39c
|
move gateway_error require to lib/spree/core.rb
|
2020-11-10 14:55:56 -08:00 |
|
Luis Ramos
|
c785d0d1d7
|
Make engine's routes append to main app instead of prepend
|
2020-11-04 12:15:45 +00:00 |
|
Luis Ramos
|
09aef524f3
|
Make route helpers use spree helper
|
2020-11-04 12:15:45 +00:00 |
|
Luis Ramos
|
c9972189d0
|
Change usage of Spree::Admin::BaseController to Admin::BaseController
|
2020-10-31 09:56:59 +00:00 |
|
Luis Ramos
|
66ba9ff73d
|
Move Spree::Admin::BaseController to Admin::BaseController
|
2020-10-31 09:51:37 +00:00 |
|
Luis Ramos
|
55e8dace44
|
Fix sort_by issue on relation by calling to_a
|
2020-10-30 10:12:56 +00:00 |
|
Luis Ramos
|
7b06fdd943
|
Convert to array before using sort_by!
|
2020-10-30 10:12:56 +00:00 |
|
Andy Brett
|
57fe1db10e
|
guard against nil params[:available_units]
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
18d2599075
|
indicate block argument is unused
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
292b33b4ea
|
simplify available units params (and remove regex!)
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
c9b540677c
|
refactor general settings controller to handle available_units params
|
2020-10-29 09:17:49 -07:00 |
|
Andy Brett
|
cb3ea133e9
|
add available units to instance prefs page
|
2020-10-29 09:17:31 -07:00 |
|
Matt-Yorkley
|
489529d30e
|
Merge pull request #5729 from luisramos0/image_settings
Remove Image settings page and standardise Paperclip styles
|
2020-10-22 15:58:14 +02:00 |
|
Luis Ramos
|
b267f542d1
|
Merge pull request #5980 from luisramos0/spree_clean_up
[Bye bye spree] Some clean up fixes to make it all work without spree
|
2020-10-20 18:52:54 +01:00 |
|
Luis Ramos
|
0f06195baa
|
Remove Image settings page, these settings will come from ofn-install now
|
2020-10-20 11:20:37 +01:00 |
|
Maikel
|
8c65498661
|
Merge pull request #5998 from andrewpbrett/shipping-per-pound
Per-pound shipping calculator
|
2020-10-16 15:27:57 +11:00 |
|
Luis Ramos
|
0100963a39
|
Delete dead code brought from spree
|
2020-09-26 21:16:27 +01:00 |
|
Andy Brett
|
fdb1019ee2
|
fix styles per rubocop
|
2020-09-17 16:41:49 -07:00 |
|
Luis Ramos
|
1a513567f2
|
Fix easy rubocop issues
|
2020-09-17 13:59:41 +01:00 |
|
Luis Ramos
|
1df7890a0d
|
Use spree url_helpers
|
2020-09-17 13:59:41 +01:00 |
|
Luis Ramos
|
d5d62894a5
|
Use spree url helpers
|
2020-09-17 13:59:41 +01:00 |
|
Luis Ramos
|
66f27aad32
|
Explicitly use spree url helpers for spree routes
|
2020-09-17 13:59:41 +01:00 |
|
Luis Ramos
|
e0cb7a29bf
|
Add helper prefix to helper calls
|
2020-09-17 13:58:45 +01:00 |
|
Luis Ramos
|
f1358dfa9a
|
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
4206 back from edit product removed filters products page
|
2020-09-17 11:51:58 +01:00 |
|
Andy Brett
|
c618ba3b2c
|
style fixes
|
2020-09-07 13:44:42 -07:00 |
|
Andy Brett
|
5a5cbbd318
|
add drop down list for unit preference
|
2020-09-07 13:26:09 -07:00 |
|
Andy Brett
|
adb29a9c8f
|
add preferred_unit to weight shipping calculator
|
2020-09-07 08:41:48 -07:00 |
|
Andy Brett
|
5793f0103d
|
Revert "Add a per-pound calculator and a spec for it"
This reverts commit e8eadcbf39.
|
2020-09-07 07:50:59 -07:00 |
|
Andy Brett
|
e8eadcbf39
|
Add a per-pound calculator and a spec for it
|
2020-09-06 09:03:06 -07:00 |
|
Arun Kumar Mohan
|
bf07da6267
|
Fix the order resend message translation
|
2020-08-29 20:47:28 -05:00 |
|
Gaetan Riou
|
bba683469b
|
add product filter parameters on the group buy options and search pages, so that the bulk import product page filters can be preserved
|
2020-08-21 10:39:43 +10:00 |
|
Gaetan Riou
|
c6e1f458cc
|
add product filter parameters on the various product properties pages, so that the bulk import product page filters can be preserved
|
2020-08-21 10:39:43 +10:00 |
|
Gaetan Riou
|
a6444e76a5
|
add product filter parameters on the various product image pages, so that the bulk import product page filters can be preserved
|
2020-08-21 10:29:07 +10:00 |
|
Gaetan Riou
|
9b26ff2fa4
|
move product filter helper to a service
|
2020-08-21 10:29:07 +10:00 |
|
Gaetan Riou
|
459708dbc8
|
add product filter parameters on the various product variants pages, so that the bulk import product page filters can be preserved
|
2020-08-21 10:29:07 +10:00 |
|
Gaetan Riou
|
f75aaf0b45
|
extract product filter functionality to a helper
|
2020-08-21 10:19:53 +10:00 |
|
Gaetan Riou
|
1a186affcf
|
refactor create and update to get rid of respond_override
|
2020-08-21 10:19:53 +10:00 |
|
Gaetan Riou
|
6e5c168d3b
|
add filter parameters to link leading back to bulk import product page and preserve filter parameters when updating product
|
2020-08-21 10:19:53 +10:00 |
|
Luis Ramos
|
f8146fb946
|
Adapt finders to rails 4
|
2020-08-16 16:50:54 +01:00 |
|
Maikel Linke
|
fe0c04b650
|
Complete renaming of AdvanceOrderService to OrderWorkflow
|
2020-07-29 12:24:18 +10:00 |
|
Luis Ramos
|
26eee4631f
|
Rename AdvanceOrderService to OrderWorkflow
|
2020-07-28 23:40:49 +01:00 |
|
Pau Perez
|
59da07de66
|
Handle all errors when dealing with payment event
This basically catches ActiveRecord::RecordInvalid caused by an invalid
credit record, for instance, but also other situations we haven't
forseen.
|
2020-07-23 20:24:31 +02:00 |
|
Pau Pérez Fabregat
|
426c536750
|
Merge pull request #5677 from luisramos0/remove_spree_root_path
Bring ControllerHelpers from Spree and remove spree root path
|
2020-07-21 16:15:21 +02:00 |
|
Luis Ramos
|
1666ffb191
|
Remove try_spree_current_user
This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
|
2020-07-15 14:53:35 +01:00 |
|
Matt-Yorkley
|
c009fed6be
|
Update StrongParams for Pin Payments
|
2020-07-15 14:00:19 +02:00 |
|