Commit Graph

  • 0ac16ce096 Get useful feedback from Rubocop Metrics cops Pau Perez 2018-09-17 13:00:44 +02:00
  • 62bebdb15e Merge pull request #2698 from openfoodfoundation/dependabot/bundler/uglifier-4.1.19 Pau Pérez Fabregat 2018-09-19 18:02:06 +02:00
  • 57bb1fec9a Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour luisramos0 2018-09-14 22:37:40 +01:00
  • a2b3d8372e Reduce complexity of OrderUpdater decorator Pau Perez 2018-09-18 11:18:31 +02:00
  • 99ba9d7d1b Merge branch '2-0-stable' into unit-test-variant-stock Pau Pérez Fabregat 2018-09-19 15:41:21 +02:00
  • b77dd41eb0 Refactored spree/order_details, extracted delivery and pickup details into separate partials. This was copied/adapted from 6f7c8bb8b1 Pau Perez 2017-07-03 13:05:15 +02:00
  • 0491a96d44 Ask to use backorderable? instead of on_demand Pau Perez 2018-09-19 15:12:38 +02:00
  • 454cd8bfbf Updating translations for config/locales/nb.yml Transifex-Openfoodnetwork 2018-09-19 22:30:06 +10:00
  • c4d4b52668 Merge pull request #2742 from openfoodfoundation/transifex HugsDaniel 2018-09-19 14:18:03 +02:00
  • 3cbb576b4f Move payment object logic out of order serializer and delete code Matt-Yorkley 2018-09-19 10:21:01 +01:00
  • ba254802f8 Move angular_pagination to /views/admin/shared/ Matt-Yorkley 2018-09-19 09:27:44 +01:00
  • 9ce32e3c14 Add new ordersCtrl spec Matt-Yorkley 2018-09-18 09:51:11 +01:00
  • 64620c2797 Tidy up response formats for easier testing Matt-Yorkley 2018-09-18 01:16:37 +01:00
  • 6768055b4d Split orders into 2 angular controllers Matt-Yorkley 2018-09-18 01:09:31 +01:00
  • b2551b4e0b Rewrite existing specs Matt-Yorkley 2018-09-17 16:34:52 +01:00
  • 68f0c80016 Add loading message and spinner Matt-Yorkley 2018-09-17 12:45:26 +01:00
  • 9da6a5a9b3 Add column sorting to table Matt-Yorkley 2018-09-17 12:13:57 +01:00
  • 2112f296e4 Angularise filters Matt-Yorkley 2018-09-13 12:33:10 +01:00
  • 3b9d9db16b Add pagination Matt-Yorkley 2018-09-13 11:00:05 +01:00
  • 524f9af148 Drop unused db column line_items.shipping_method_name luisramos0 2018-09-19 11:38:19 +01:00
  • 93d273f94a Convert orders index table to use angular ng-repeat Matt-Yorkley 2018-09-12 18:00:21 +01:00
  • f0d015be0d Updating translations for config/locales/de_DE.yml Transifex-Openfoodnetwork 2018-09-19 08:34:42 +10:00
  • 258347bc63 Updating translations for config/locales/fr.yml Transifex-Openfoodnetwork 2018-09-19 01:45:12 +10:00
  • edcdf59621 In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec. luisramos0 2018-09-14 23:20:27 +01:00
  • 314ad5400f Move variant_stock.rb to concerns/ Pau Perez 2018-09-10 18:58:42 +02:00
  • 9f7d24934d Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters Pau Pérez Fabregat 2018-09-18 11:42:19 +02:00
  • 2a0e0eed73 Move state_machine's additions inside class_eval Pau Perez 2018-09-18 10:06:12 +02:00
  • 1fdc578901 Increase readability (a bit) of OrderUpdater Pau Perez 2018-09-17 16:48:01 +02:00
  • 99cdeca0b1 Remove useless RSpec context block Pau Perez 2018-09-17 16:23:06 +02:00
  • 13f73b4512 Test :restart_checkout state machine event Pau Perez 2018-09-13 11:25:41 +02:00
  • e79f7c13f1 Merge pull request #2727 from luisramos0/2-0-shipment-adjustment Pau Pérez Fabregat 2018-09-18 09:37:10 +02:00
  • 1130bb341d Merge pull request #2677 from luisramos0/2-0-sample-data Maikel 2018-09-18 16:37:22 +10:00
  • 19df4ff640 Merge pull request #2701 from mkllnk/2700-improve-product-refresh-scheduling Maikel 2018-09-18 12:09:24 +10:00
  • ccf7d91487 Bump oj from 2.1.2 to 3.6.10 dependabot[bot] 2018-09-17 19:16:27 +00:00
  • c22ac0086b Moved cookies_policy_helper to Web engine and respective spec luisramos0 2018-09-17 13:53:19 +01:00
  • 95f2f92cf3 Extracted cookies footer links from view to footer links helper luisramos0 2018-09-17 13:42:48 +01:00
  • bded530137 Moved web api endpoint from /api to /web/api luisramos0 2018-09-17 13:06:19 +01:00
  • dc5eb6448e Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css luisramos0 2018-09-17 12:45:06 +01:00
  • d170a4d489 New domain Web (rails engine) with the following features extracted from the main app: - cookies banner - cookies policy page - cookies policy and privacy policy links in the footer luisramos0 2018-08-07 15:25:47 +01:00
  • e577bcb46f Prepare angular controller and serialized data Matt-Yorkley 2018-09-12 12:49:16 +01:00
  • 0f627cdf39 Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle Pau Pérez Fabregat 2018-09-17 12:38:29 +02:00
  • 0520f2187c Merge pull request #2540 from luisramos0/delete_dead_store Pau Pérez Fabregat 2018-09-17 11:33:56 +02:00
  • 798a6ed391 Translate more text in OC filters Kristina Lim 2018-09-14 01:15:59 +08:00
  • 843cd44b23 In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments luisramos0 2018-09-17 00:21:06 +01:00
  • c66b611b99 Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec luisramos0 2018-09-16 23:27:13 +01:00
  • 75656668cd Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments luisramos0 2018-09-16 22:42:24 +01:00
  • 38c2f52278 In features/admin/reports_spec, fixed setting shipping_method in order, this is now done through order shipments luisramos0 2018-09-16 21:45:29 +01:00
  • fbd2d96b05 Moved shipment and shipping_method factories with flat rate and shipping fees to traits luisramos0 2018-09-16 21:24:29 +01:00
  • 7b6e4825e7 Fixed controllers/spree/admin/orders/customer_details_controller_spec: - fixed order creation to use order.shipments instead of order.shipping_method - adapted test to new spree 2 controller logic (shipments page is gone since 67f568914988bcc0a1fc520d15ed6444a6d12824 and redirect logic changed on e9cde1b4d570dd4f7f979ac71a58d6f3f342ebb4) luisramos0 2018-09-16 20:53:00 +01:00
  • 93ac99b5cc Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec luisramos0 2018-09-16 19:26:45 +01:00
  • ac85b90315 Clarify private class method declaration Maikel Linke 2018-09-15 10:18:54 +10:00
  • 8e5f43ed25 Fixed current order serializer spec name luisramos0 2018-09-14 23:12:00 +01:00
  • 238d2f4feb Removed unnecessary code copied and replaced with call to identical super class luisramos0 2018-09-14 22:20:21 +01:00
  • 5b3a529487 Adapted address_finder_spec to spree 2 shipments luisramos0 2018-09-14 18:22:00 +01:00
  • d685b706ad In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists luisramos0 2018-09-14 16:33:32 +01:00
  • 2da7cc00f8 Fixed Address Finder last_used_ship_address. It now uses order.shipments.shipping_methods instead of order.shipping_method luisramos0 2018-09-14 16:43:20 +01:00
  • 6b3fd22db8 Adapted order_decorator to spree 2 by fixing adjustment.update! call on update_adjustment luisramos0 2018-09-14 15:33:42 +01:00
  • ce7be68fac Merge pull request #2660 from kristinalim/translations-failed_oc_creation Maikel 2018-09-14 16:58:39 +10:00
  • 05225aaba7 [Security] Bump uglifier from 2.7.1 to 4.1.19 dependabot[bot] 2018-09-14 06:29:22 +00:00
  • c3f461ad6e Merge pull request #2622 from openfoodfoundation/dependabot/bundler/db2fog-0.9.0 Maikel 2018-09-14 16:26:54 +10:00
  • e836ac0234 Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link Maikel 2018-09-14 15:46:05 +10:00
  • beedd933e9 Merge pull request #2512 from kristinalim/feature-remove_enterprise_images Maikel 2018-09-14 15:07:24 +10:00
  • eabb9f4574 Merge pull request #2659 from kristinalim/translations-admin_area_fixes Maikel 2018-09-14 14:38:25 +10:00
  • da2f278060 Merge pull request #2649 from kristinalim/translations-fix_store_link_in_admin_header Maikel 2018-09-14 14:24:29 +10:00
  • 43a3ecff06 Merge pull request #2612 from openfoodfoundation/dependabot/bundler/jwt-1.5.6 Maikel 2018-09-14 14:13:02 +10:00
  • 514f64c8d0 Merge pull request #2650 from kristinalim/translations-more_admin_header Maikel 2018-09-14 13:31:13 +10:00
  • 6b56def649 Merge pull request #2697 from mkllnk/2655-fix-admin-payments Maikel 2018-09-14 11:26:20 +10:00
  • 1000bd4d24 Merge pull request #2658 from kristinalim/translations-order_and_shipment_emails Maikel 2018-09-14 10:11:56 +10:00
  • 8dd0e01b8e Use explicit syntax for section objects in preference_sections definition Hugo Daniel 2018-09-13 12:34:06 +02:00
  • 692101db36 Merge pull request #2691 from coopdevs/fix-variant-override-spec Pau Pérez Fabregat 2018-09-13 12:21:35 +02:00
  • ec953e1db0 Style cache refreshment class Maikel Linke 2018-09-13 17:22:01 +10:00
  • 2e635f94f6 Make job queuing more robust and efficient Maikel Linke 2018-09-13 17:18:03 +10:00
  • b676bfdcc8 Bump jwt from 1.5.4 to 1.5.6 dependabot[bot] 2018-09-13 02:34:11 +00:00
  • 065df96872 Merge pull request #2675 from Matt-Yorkley/bi/remake_views Maikel 2018-09-13 12:29:54 +10:00
  • 5e722bf57d Merge pull request #2634 from luisramos0/cookies_matomo_optout Maikel 2018-09-13 12:29:09 +10:00
  • f46c1e8414 Merge pull request #2424 from frank-west-iii/issue-2100-mini-racer Maikel 2018-09-13 12:28:03 +10:00
  • 81f60aab46 Make PaymentMethod serialisable with fees Maikel Linke 2018-09-13 11:59:34 +10:00
  • d7b19750e5 Add spec for GH issue #2655 Maikel Linke 2018-09-11 17:50:34 +10:00
  • a447fe4f40 Require lib file where needed Maikel Linke 2018-09-11 16:58:12 +10:00
  • 478dd68072 In cookies policy helper, added string interpolation to variable to avoid variable (Spree::Config entry) to break the concatenation. Added unit test to validate the error case luisramos0 2018-09-11 17:25:11 +01:00
  • 409f084bd4 Added matomo opt out iframe to cookies policy page luisramos0 2018-09-02 14:59:58 +01:00
  • ce148e0197 Fix failing spec due to wrong attribute Pau Perez 2018-09-12 16:47:22 +02:00
  • 3f5c799166 Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page Pau Pérez Fabregat 2018-09-12 16:17:34 +02:00
  • cc43d789e2 Refacto edit method for content controller and enable custom user guide link Hugo Daniel 2018-09-12 14:51:53 +02:00
  • 91c0de3f2a Bump db2fog from 0.8.0 to 0.9.0 dependabot[bot] 2018-09-12 11:09:57 +00:00
  • e474271698 Merge pull request #2637 from Vadlusk/remove_css_splitter Pau Pérez Fabregat 2018-09-12 13:07:15 +02:00
  • 64e71a1ee7 Merge pull request #2544 from kristinalim/fix-scrolling_in_modals Pau Pérez Fabregat 2018-09-12 13:05:20 +02:00
  • 145b4385a4 Fixed db:load_sample_data shipping_method build luisramos0 2018-09-11 22:20:25 +01:00
  • 4d9ebf0550 Apply submenu override Matt-Yorkley 2018-09-11 12:17:28 +01:00
  • f08d6389d8 Apply capture order override Matt-Yorkley 2018-09-11 12:06:58 +01:00
  • 507f4d0878 OCD tidy up of visually misaligned filter Matt-Yorkley 2018-09-11 11:53:37 +01:00
  • afedaea2b5 Apply special instructions override Matt-Yorkley 2018-09-11 11:45:40 +01:00
  • 8f174b1308 Apply ship shortcut override Matt-Yorkley 2018-09-11 11:43:38 +01:00
  • ba0701457e Apply distributor td override Matt-Yorkley 2018-09-11 11:42:08 +01:00
  • 6389c552ca Apply distributor th override Matt-Yorkley 2018-09-11 11:41:25 +01:00
  • 1958ac9932 Apply distributor filter inputs override Matt-Yorkley 2018-09-11 11:39:05 +01:00
  • c7e2f817ed Apply colgroup override Matt-Yorkley 2018-09-11 11:34:34 +01:00
  • 5a2491cb47 Apply ng-app override Matt-Yorkley 2018-09-11 11:30:14 +01:00
  • 980c46c63f Convert Spree view to HAML Matt-Yorkley 2018-09-11 11:22:54 +01:00
  • e58f7269c3 Merge pull request #2652 from luisramos0/2-0-within-zone Pau Pérez Fabregat 2018-09-11 08:43:06 +02:00