raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,012 Commits 16 Branches 454 Tags
228997c35bb94c79d4e14631da1495fb8232b375
Commit Graph

8826 Commits

Author SHA1 Message Date
luisramos0
667f44336d Remove unused split logic from variant autocomplete, the split functionality is not used in ofn because we only have one stock location 2020-01-28 13:53:04 +00:00
luisramos0
0a136ff2fb Comment out click event registration as this will duplicate events until the spree_backend code is there 
These can be activated when spree_backend is removed
 2020-01-28 13:53:04 +00:00
luisramos0
3f3577e73c Remove encoding tag from admin/spree/orders js files 2020-01-28 13:53:04 +00:00
luisramos0
cf1664bed3 Bring some variant autocomplete styling from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
b8aee4e857 Bring address_states as is from spre_backend 2020-01-28 13:53:04 +00:00
luisramos0
cfe3435851 Bring shipments.js as is from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
53e342ba1a Bring variant_autocomplete from spree_backend as is 2020-01-28 13:53:04 +00:00
luisramos0
6bdb14248c Require lodash.underscore to support _. calls in js 
spree_backend relies on Underscore.js 1.4.4, from Jan 2013, in some auto complete functions, here we will be depending on Lo-Dash 2.4.1, from Dec 2013
 2020-01-28 13:53:03 +00:00
luisramos0
8e27291b15 require handlebars extensions from spree_core to allow translations inside handlebar templates 2020-01-28 13:52:19 +00:00
Luis Ramos
a6ade31604 Merge pull request #4607 from luisramos0/legacy_browsers_support 
Remove unused js dependencies (jquery-migrate-1.0.0 and timeago) and bring some legacy browsers support dependencies from spree_backend
 2020-01-28 12:49:38 +00:00
Luis Ramos
b348552cdf Merge pull request #4651 from mkllnk/remove-unused-presenter 
Remove unused presenter
 2020-01-28 09:52:01 +00:00
Luis Ramos
c7d8e96beb Merge pull request #4699 from mkllnk/4696-rescue-checkout 
Rescue unknown checkout errors
 2020-01-24 18:11:38 +00:00
luisramos0
904c85c5be Move css import to ie hacks file where it's needed 2020-01-23 19:01:52 +00:00
luisramos0
a5f222b067 Bring css_browser_selector_dev from spree_backend and respective hacks 2020-01-23 14:45:35 +00:00
luisramos0
0ec39106b1 Bring modernizr from spree_backend 2020-01-23 14:45:35 +00:00
luisramos0
c59afd4951 Remove jquery-migrate-1.0.0, we already have jquery-migrate 1.2.1 (jquery-migrate-min) through gemfile jquery-migrate-rails 2020-01-23 14:45:35 +00:00
luisramos0
2c59b522de Reorganize admin/all.js in meaningful groups 2020-01-23 14:45:35 +00:00
luisramos0
337fbf1be9 Remove unused JS dependency timeago, we use momentjs now 2020-01-23 14:45:35 +00:00
luisramos0
1548eaeb7e Add frozen_string_literal magic comment 2020-01-23 14:42:19 +00:00
luisramos0
4b0ddcda01 Add require to fix loading issue. Some other Permissions module was being loaded 2020-01-23 11:42:10 +00:00
Luis Ramos
43d7609b81 Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs 
Remove tabs from cart and checkout
 2020-01-23 10:19:50 +00:00
Maikel Linke
bd67d63b63 Restore payment error feedback 2020-01-23 16:20:07 +11:00
Maikel Linke
6763012ee9 Rescue unknown checkout errors 2020-01-23 16:20:07 +11:00
Luis Ramos
494cb00774 Merge pull request #4585 from luisramos0/backend_partial_calc_fields 
Bring spree_backend calculator fields partial to OFN
 2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458 Merge pull request #4633 from luisramos0/fix_prod_link_bug 
Fix bug in frontoffice order details where the product image was a broken link
 2020-01-22 20:25:24 +00:00
Matt-Yorkley
444747c8b2 Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout). 2020-01-22 11:30:43 +01:00
Luis Ramos
6bb4f2477c Merge pull request #4586 from luisramos0/states_erb 
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
 2020-01-21 22:47:28 +00:00
Luis Ramos
1c3fd26eef Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs 
Mobile: shop tabs
 2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429 Update shop tab button styling in mobile 2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb Remove old green box styling from shopfront messages 2020-01-19 15:57:01 +01:00
luisramos0
1e203ae419 Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend 2020-01-16 11:59:36 +00:00
luisramos0
70a24b25e2 Update rubocop manual todo and Remove some unnecessary comments 2020-01-16 11:59:36 +00:00
luisramos0
f7490ae28b Remove unused stock and destroy actions and bring product routes from spree_backend 2020-01-16 11:58:59 +00:00
luisramos0
836abbec92 Fix rubocop issues in variant controller 2020-01-16 11:58:59 +00:00
luisramos0
d153237b69 Merge variants decorator with controller 2020-01-16 11:58:59 +00:00
luisramos0
56b6bf82bb Fix some rubocop issues 2020-01-16 11:58:59 +00:00
luisramos0
0d44f298fe Merge spree/admin/products_controller with its decorator 2020-01-16 11:58:59 +00:00
luisramos0
ff3611f52a Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
luisramos0
7fa9b4699c Add products_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
Maikel
0da6275d41 Merge pull request #4675 from Matt-Yorkley/rails-4-prep-3 
Rails 4 prep continued
 2020-01-16 15:08:11 +11:00
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2 
Rails 4 prep: admin dashboard route
 2020-01-16 14:16:32 +11:00
Luis Ramos
0432c73f19 Merge pull request #4510 from luisramos0/backend_ctrl_resource 
Bring spree_backend resource controller to OFN
 2020-01-15 22:22:24 +00:00
Matt-Yorkley
103902c006 Replace deprecated arguments in #find_by 
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')

       ActiveRecord::StatementInvalid:
         PG::UndefinedColumn: ERROR:  column enterprises.select does not exist
         LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
         : SELECT  "enterprises".* FROM "enterprises"  WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
       # ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
       # ./app/models/product_import/spreadsheet_data.rb:43:in `each'
 2020-01-15 16:39:33 +01:00
Matt-Yorkley
d2933e35f1 Explicitly require Spree::Admin::BaseHelper 
NameError: undefined method `preference_field_tag' for module `Spree::Admin::BaseHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:11:in `<module:BaseHelper>'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:3:in `<module:Admin>'
 2020-01-15 13:07:50 +01:00
Matt-Yorkley
0b5e341ae7 Explicitly require Spree::Admin::NavigationHelper 
NameError: undefined method `klass_for' for module `Spree::Admin::NavigationHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/navigation_helper_decorator.rb:18:in `<module:NavigationHelper>'
 2020-01-15 13:07:46 +01:00
Matt-Yorkley
d511763733 Replace deprecated #in? method 2020-01-15 12:57:38 +01:00
Matt-Yorkley
d4311a848e Fix default_scope deprecated syntax 2020-01-15 12:57:38 +01:00
Luis Ramos
3bf38b7c08 Merge pull request #4549 from luisramos0/arelize_order_permissions 
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
 2020-01-14 14:24:34 +00:00
Luis Ramos
3080eb9dfd Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api 
Removing duplicate API method soft_delete for both products and variants
 2020-01-14 11:32:10 +00:00
Luis Ramos
f87a553230 Merge pull request #4648 from openfoodfoundation/dependabot/bundler/rubocop-0.79.0 
Bump rubocop from 0.68.1 to 0.79.0
 2020-01-13 19:35:50 +00:00