luisramos0
f840179573
Remove .json from Spree.routes.orders_api. This path is only used to compose the order shipments path and thus cannot have the .json
2019-10-28 16:00:36 +00:00
luisramos0
c98b4b276b
Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes AND move spree/api/orders route to ofn api/orders route
2019-10-28 16:00:36 +00:00
Luis Ramos
688dad2334
Merge pull request #4384 from chaserx/4378_display_customer_name_on_orders_table
...
adds the full_name of the customer ordering beneath email
2019-10-28 15:52:54 +00:00
Luis Ramos
1fa6e4bea8
Merge pull request #4385 from chaserx/4304_fixes_missing_translation
...
adds missing :spree to i18n scopes
2019-10-24 17:06:50 +01:00
Luis Ramos
498a2b7462
Merge pull request #4386 from andrewjprice/missing-translations-inventory-page
...
Missing translations inventory page
2019-10-24 17:06:43 +01:00
luisramos0
42cd9a5152
Remove menu entry option types because this page is not really usable
...
We keep the underlying data structures because option types and option values are used internally to keep units in OFN: weight, volume and items, but otherwise, custom option types are no longer possible in OFN
2019-10-23 12:57:47 +01:00
luisramos0
cc342387cc
Make all calls to content_for use dash not equals when setting content_for
2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3
Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial
2019-10-23 12:26:18 +01:00
Dan Ingenthron
3c7af90dfa
Revert I18n change and reflect correct required fields on OC form
2019-10-22 17:41:38 -05:00
Dan Ingenthron
85dede84cc
Update order cycle forms & en.yml to include asterisks
2019-10-22 17:41:37 -05:00
luisramos0
3372339907
Fix default stock translation by using t filter instead of t function
2019-10-22 17:29:04 +01:00
Luis Ramos
02c0b89fa0
Merge pull request #4345 from Matt-Yorkley/shopfront_pagination
...
Shopfront pagination
2019-10-21 16:02:12 +01:00
Luis Ramos
c9e23154d8
Merge pull request #4352 from tkusuki/fix-translation-in-enterprise-welcome-email
...
Add missing translation in non English enterprise welcome email
2019-10-21 11:41:53 +01:00
Andrew
deb17f47a7
Add default_stock to en.yml and _products_variants
2019-10-19 16:33:31 -07:00
Chase Southard
61ee0f04a6
adds missing :spree to i18n scopes
2019-10-19 13:55:11 -04:00
Chase Southard
353804a3fa
adds the full_name of the customer ordering beneath email
2019-10-19 12:32:59 -04:00
Andrew
598426a5e9
Add Save Changes button translation
2019-10-18 22:18:54 -07:00
Matt-Yorkley
37e5e1923c
Improve filter buttons UX
2019-10-18 21:15:13 +01:00
Matt-Yorkley
573a69477f
Fix filters not updating on OC change
2019-10-18 21:15:13 +01:00
Matt-Yorkley
ab330e882e
Remove product cache
2019-10-18 21:15:11 +01:00
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
luisramos0
ec3c3aa644
Bring images views from spree_backend
2019-10-15 00:02:40 +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
Dan Ingenthron
9b7139fd45
Add default shipping category during object creation; revert forms
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
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
Thais Kusuki
797a3ad091
Add missing translation in non English enterprise welcome email
2019-10-05 12:50:12 -03: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
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
Pau Pérez Fabregat
c2f8803d72
Merge pull request #4297 from luisramos0/inv_levels
...
Remove all usages of Spree Config track_inventory_levels
2019-10-01 10:35:20 +02:00
Luis Ramos
d162e8c087
Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card
...
Translation: "Add new credit card"
2019-09-30 13:27:25 +01:00
Dan Ingenthron
e8f9ace8e6
Correct translation key on add card link
2019-09-24 13:42:31 -05:00
luisramos0
f3bc038c05
Make translations in new product page relative and specific to the page
2019-09-23 17:02:30 +01:00
luisramos0
591efecde6
Make unit description field visible in the variant edit page even for products which variant_unit is items
2019-09-22 16:42:03 +01:00
luisramos0
cd6d34663e
Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0
2019-09-22 15:25:24 +01:00
luisramos0
4f9eee2682
Fix feature specs added from spree_backend in the configuration area
2019-09-20 15:43:55 +01:00
luisramos0
cc0dabcd1e
Convert spree/admin/tax_rates from erb to haml
2019-09-20 15:36:58 +01:00
luisramos0
e79c672263
Convert spree/admin/tax_categories from erb to haml
2019-09-20 15:36:54 +01:00
luisramos0
bc6f7934e0
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 15:35:49 +01:00
luisramos0
def9ab7c47
Convert spree/admin/taxons from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2a68d34fb0
Convert spree/admin/taxonomies from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2ce56aef2c
Add spree_backend views related to admin/configuration taxonomies that are missing in ofn
2019-09-20 15:23:45 +01:00
