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 |
|
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 |
|
Luis Ramos
|
2d4326ded3
|
Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
Present is not blank, so unless blank? becomes if present?
|
2020-07-01 14:08:07 +01:00 |
|
Cillian O'Ruanaidh
|
a9664e103d
|
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
|
2020-06-29 18:11:08 +01:00 |
|
Luis Ramos
|
f848a89a00
|
Rename update_attributes to update #rails4
|
2020-06-22 16:51:43 +01:00 |
|
Luis Ramos
|
8a61257547
|
Rename all before_filter to before_action, it's the same function with a new name
|
2020-06-22 13:11:57 +01:00 |
|
Luis Ramos
|
3b91dd9dea
|
Use rubocop auto-correct to fix more issues
|
2020-06-22 12:51:47 +01:00 |
|
Pau Pérez Fabregat
|
db80992326
|
Merge branch 'master' into drop-blockenspiel
|
2020-06-19 12:12:10 +02:00 |
|
Luis Ramos
|
f6e3e01a10
|
Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller
Add spec to verify payment source attributes are passed
|
2020-06-18 09:54:34 +01:00 |
|
Luis Ramos
|
3f7fb0ecc2
|
Add missing permitted attributes to zones
|
2020-06-16 13:56:39 +01:00 |
|
Luis Ramos
|
7db519ab62
|
Merge pull request #5570 from luisramos0/ship_methods_form
[Spree 2.1] Make Shipping methods form save calculator details
|
2020-06-15 15:05:50 +01:00 |
|
Pau Perez
|
456f369b76
|
Fix outstanding Rubocop violations
|
2020-06-15 10:17:34 +02:00 |
|
Cillian O'Ruanaidh
|
ba126d5afc
|
Move the bulk coop controller specs to the order management engine.
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
|
2020-06-13 15:42:26 +01:00 |
|
Cillian O'Ruanaidh
|
bcf79ef803
|
Fix code climate violations related to removing blockenspiel.
|
2020-06-13 13:27:44 +01:00 |
|
Matt-Yorkley
|
86db1b6d68
|
Fix "subquery has too many columns" in reports query
|
2020-06-12 12:55:50 +02:00 |
|
Luis Ramos
|
983bed3c4e
|
Merge branch 'master' into 3-0-stable-jun-2
|
2020-06-11 19:50:56 +01:00 |
|
Luis Ramos
|
13a4a3edbe
|
Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight
Fix admin config separator without highlight
|
2020-06-10 23:00:30 +01:00 |
|
Luis Ramos
|
f05b0d1a57
|
Add missing fields to ship method controller permitted params list
|
2020-06-09 12:02:59 +01:00 |
|
Cillian O'Ruanaidh
|
406309c577
|
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
|
2020-06-05 16:43:38 +01:00 |
|
Matt-Yorkley
|
9e278d5b2f
|
Improve performance in various reports
|
2020-06-05 16:39:01 +02:00 |
|
Luis Ramos
|
cce26cb453
|
Merge branch '3-0-stable' into 3-0-stable-jun-2
|
2020-06-03 19:51:43 +01:00 |
|