Luis Ramos
|
d7223c508a
|
Merge pull request #4289 from luisramos0/spree_be_config_general
Move general_settings, mail_methods and image_settings from spree_backend to OFN
|
2019-10-16 12:08:36 +01:00 |
|
luisramos0
|
04bf5a8742
|
Convert images views from erb to haml
|
2019-10-16 11:58:08 +01:00 |
|
Jackson Bates
|
8d30dc997f
|
adds better description to specs and refactors editProductUrl and confirm_unsaved_changes
|
2019-10-16 21:55:52 +11:00 |
|
luisramos0
|
6bc0d505e4
|
Fix some rubocop issues
|
2019-10-16 10:40:16 +01:00 |
|
luisramos0
|
9a0f1adfd2
|
Reorganize/simplify before filters
|
2019-10-16 10:40:09 +01:00 |
|
luisramos0
|
ec3c3aa644
|
Bring images views from spree_backend
|
2019-10-15 00:02:40 +01:00 |
|
luisramos0
|
0f128f43f9
|
Merge images controller decorator with the controller brought from spree_backend
|
2019-10-15 00:02:16 +01:00 |
|
luisramos0
|
ea9f3ad6a0
|
Bring images controller from spree_backend so we can merge it with ofn's decorator
|
2019-10-15 00:00:54 +01:00 |
|
luisramos0
|
1c257cca3f
|
Merge payment methods controller brought from spree_backend with its decorator that was in OFN
|
2019-10-14 23:14:09 +01:00 |
|
luisramos0
|
c51e4d657a
|
Bring payment method controller from spree_backend
|
2019-10-14 23:09:23 +01:00 |
|
Luis Ramos
|
35d76ac991
|
Merge pull request #4298 from luisramos0/variant_edit
Make unit description visible in the variant edit page even for products which variant_unit is items
|
2019-10-13 19:54:41 +01:00 |
|
Matt-Yorkley
|
da7456e6e0
|
Remove old shop/products route, action, and spec
|
2019-10-09 17:27:00 +01:00 |
|
Matt-Yorkley
|
f134cd9473
|
Extract tag_rule filtering into separate service
|
2019-10-09 17:26:58 +01:00 |
|
Dan Ingenthron
|
bdcadf9fc6
|
Update changes to reflect new non-Spree shipping method controller
|
2019-10-08 18:37:16 -05:00 |
|
Dan Ingenthron
|
9b7139fd45
|
Add default shipping category during object creation; revert forms
|
2019-10-08 18:37:16 -05:00 |
|
Dan Ingenthron
|
dbf34da87b
|
Rubocop fixes
|
2019-10-08 18:37:16 -05:00 |
|
Dan Ingenthron
|
89873a2640
|
Add and auto-check default category in shipping method create
|
2019-10-08 18:37:15 -05:00 |
|
Dan Ingenthron
|
b4be2cc2d4
|
Add default shipping category service and update create product form
|
2019-10-08 18:37:15 -05:00 |
|
Dan Ingenthron
|
592a53b6f5
|
Remove blank option from shipping category dropdown
|
2019-10-08 18:37:15 -05:00 |
|
Matt-Yorkley
|
e96252f2ed
|
Add tag_rules logic to main query before pagination
|
2019-10-08 10:11:24 +01:00 |
|
Matt-Yorkley
|
06e1f56ae9
|
Extract filter list fetching into a separate endpoint
|
2019-10-08 10:11:24 +01:00 |
|
Matt-Yorkley
|
fe0de98821
|
Add pagination in Angular and views
|
2019-10-08 10:11:22 +01:00 |
|
Thais Kusuki
|
d997b8f5ee
|
Change translations from enterprise_mailer to lazy lookup
|
2019-10-07 23:29:11 -03:00 |
|
agustina
|
cf3f321632
|
Added color to links in WYSIWYG editor
|
2019-10-07 12:15:37 -03:00 |
|
luisramos0
|
95bc8fa984
|
Remove logic from OrderCycleDistributedProducts related to obsolete master variants in OCs, this is a condition that will never happen now since we ensure products always have a standard variants
A migration will be added as well to clean up any very old master variants available in order cycles
|
2019-10-07 14:53:44 +01:00 |
|
Luis Ramos
|
54c44c33eb
|
Merge pull request #4324 from Matt-Yorkley/reports_memoize
Reports memoization
|
2019-10-07 13:20:03 +01:00 |
|
Thais Kusuki
|
797a3ad091
|
Add missing translation in non English enterprise welcome email
|
2019-10-05 12:50:12 -03:00 |
|
Matt-Yorkley
|
a1a5c3b7fe
|
Add new Angular OrderCycleResource
|
2019-10-04 10:38:41 +01:00 |
|
Matt-Yorkley
|
bc826f73a1
|
Add temporary placeholder for API endpoint
|
2019-10-03 18:11:40 +01:00 |
|
Luis Ramos
|
96428c11c6
|
Merge pull request #4334 from Matt-Yorkley/products_renderer
Products renderer
|
2019-10-03 13:47:04 +01:00 |
|
Luis Ramos
|
c15660da0e
|
Merge pull request #4269 from luisramos0/spree_be_config
Move shipping_methods and shipping categories from spree_backend to OFN
|
2019-10-03 13:45:17 +01:00 |
|
luisramos0
|
30aa31252b
|
Fix simple rubocop issues in helpers
|
2019-10-02 21:26:09 +01:00 |
|
luisramos0
|
b83d74a609
|
Bring general_settings_helper from spree_backend
|
2019-10-02 21:26:09 +01:00 |
|
luisramos0
|
42e3f2f2f4
|
Convert spree/admin/mail_methods from erb to haml
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
96737da128
|
Add spree_backend mail methods views that are missing in ofn
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
7f9f0d840c
|
Merge decorators into controllers and remove decorators
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
686840e262
|
Fix basic rubocop issues in recently added controllers from spree_backend
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
2377b833ee
|
Bring general settings and image settings controllers that are overrides in ofn to ofn so we can merge them with their decorators in a second step
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
3f3c33bce6
|
Fix basic rubocop issues in newly added controller
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
e35eff95bb
|
Add mail_methods controller from spree_backend related to config
|
2019-10-02 21:25:23 +01:00 |
|
Luis Ramos
|
4540b32d3a
|
Merge branch 'master' into spree_be_config_taxons
|
2019-10-02 15:35:15 +01:00 |
|
Luis Ramos
|
14047c620a
|
Merge branch 'master' into spree_be_config_tax
|
2019-10-02 15:31:25 +01:00 |
|
Luis Ramos
|
2be1c231f7
|
Merge pull request #4290 from luisramos0/spree_be_config_zones
Move zones, countries and states from spree_backend to OFN
|
2019-10-02 14:30:59 +01:00 |
|
Luis Ramos
|
3f7aff4b8b
|
Merge pull request #4305 from luisramos0/new_product_translations
Make translations in new product page relative and specific to the page
|
2019-10-01 22:38:49 +01:00 |
|
Matt-Yorkley
|
cc11d4e5f0
|
Remove unused user parameter from OrdersAndFulfillmentsReport
|
2019-10-01 15:59:51 +01:00 |
|
Matt-Yorkley
|
112adb11db
|
Pass permissions object into OrdersAndFulfillMentsReport
|
2019-10-01 15:51:43 +01:00 |
|
Matt-Yorkley
|
c038b485b1
|
Rename service and methods to remove use of "shop" term
|
2019-10-01 14:43:47 +01:00 |
|
Jackson Bates
|
4c4bdd78e7
|
makes edit button action open a new tab
|
2019-10-01 22:13:28 +10:00 |
|
Luis Ramos
|
19eb93012c
|
Merge pull request #4326 from kristinalim/feature/4310-remove_shipments_count
4310 Do not count order shipments in Order#shipping_method
|
2019-10-01 11:17:42 +01:00 |
|
Luis Ramos
|
c4d298d732
|
Merge branch 'master' into remove_deprecations
|
2019-10-01 10:57:10 +01:00 |
|