Commit Graph

  • 1f8f7b0495 Add new Api::OrdersController spec Matt-Yorkley 2018-10-23 12:26:16 +01:00
  • 46b1317159 Update orders resource js spec Matt-Yorkley 2018-10-23 12:34:16 +01:00
  • 334eebeab1 Move json to API and strip index action Matt-Yorkley 2018-10-23 10:34:42 +01:00
  • 0bd67bd06a Remove unnecessary Spree::Config fallback value Matt-Yorkley 2018-10-23 08:18:49 +01:00
  • 77251848ee Refactor Spree::Admin::OrdersController Matt-Yorkley 2018-10-22 22:09:24 +01:00
  • 4450380cb0 Add missing translation to filter on orders admin page luisramos0 2018-10-26 16:12:41 +01:00
  • a5d4c50dea Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test. luisramos0 2018-10-26 15:25:59 +01:00
  • 09f8df6340 Reorganize LineItemsController's destroy line item specs to separate contexts with different test orders (completed_with_total and completed_with_fees) luisramos0 2018-10-25 18:06:48 +01:00
  • 8a3f621b42 Merge pull request #2893 from luisramos0/deleted_products_break_inventory Pau Pérez Fabregat 2018-10-25 18:20:42 +02:00
  • 7cac4637fe Merge pull request #2916 from luisramos0/date-transl-fix Pau Pérez Fabregat 2018-10-25 18:18:53 +02:00
  • 90d7b7f4a0 Merge branch 'master' into 2-0-stable-oct-25 luisramos0 2018-10-25 14:28:58 +01:00
  • 2cc594dc98 Proceed to hide off-canvas when resized to >1024px Kristina Lim 2018-10-25 20:34:52 +08:00
  • 14eaa49204 Disable hiding the off-canvas upon window resize. Kristina Lim 2018-10-25 19:29:07 +08:00
  • acb8ec772e Merge pull request #2922 from mkllnk/update-rubocop-todo Maikel 2018-10-25 14:48:51 +11:00
  • 3cab3d1798 Merge pull request #2921 from openfoodfoundation/transifex Maikel 2018-10-25 14:22:10 +11:00
  • cd5c23993a Update rubocop todo list Maikel Linke 2018-10-25 14:08:04 +11:00
  • e6adb8a3b9 Extract email setup in specs for easy upgrade Maikel Linke 2018-10-25 13:53:22 +11:00
  • 51a1787881 Merge pull request #2908 from Matt-Yorkley/bulk_orders_bug Maikel 2018-10-25 13:18:11 +11:00
  • dc5302ca08 Speed up database queries and make them scale Maikel Linke 2018-10-25 11:33:14 +11:00
  • c17939631f Updating translations for config/locales/en_US.yml Transifex-Openfoodnetwork 2018-10-25 09:31:36 +11:00
  • ce93c52dfe Merge pull request #2850 from Matt-Yorkley/password_change_logout Pau Pérez Fabregat 2018-10-24 11:43:09 +02:00
  • 9ef4852bd4 Merge pull request #2818 from nikobozi/refactor-variant-overrides-query Pau Pérez Fabregat 2018-10-24 11:42:22 +02:00
  • 7651ee0909 Merge pull request #2798 from as1729/as1729-update-docs-Stripe-publishable_key-for-pr Pau Pérez Fabregat 2018-10-24 11:23:21 +02:00
  • f32e4dddb1 Merge pull request #2902 from luisramos0/more-pending-tests Pau Pérez Fabregat 2018-10-23 19:00:49 +02:00
  • 9a06c1ef98 Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin Pau Pérez Fabregat 2018-10-23 18:59:01 +02:00
  • 235d42024a Merge pull request #2903 from luisramos0/2884-2-0-order-ships-path Pau Pérez Fabregat 2018-10-23 18:57:05 +02:00
  • c9784a5eda Add Portuguese and German to list of moment locales. The main usage is in the order cycle closure time in the shopfront luisramos0 2018-10-23 17:53:08 +01:00
  • 034d9ef72a Refactor multilingual spec: extract method with repeated assertion luisramos0 2018-10-23 13:59:33 +01:00
  • 9d9f5d38d7 Fix multi lingual issue in cart and checkout: the user language selection was not being used luisramos0 2018-10-23 13:35:31 +01:00
  • c5f6af95c7 Add password confirmation, token and expired keys Hugo Daniel 2018-10-23 10:40:20 +02:00
  • 6f5289c730 Merge pull request #2894 from openfoodfoundation/transifex Maikel 2018-10-23 16:21:20 +11:00
  • a9b390d0aa Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs Luis Ramos 2018-10-22 23:12:20 +01:00
  • 42c1584e6f Fix pagination conflict with LineItemsCtrl requests Matt-Yorkley 2018-10-22 17:55:43 +01:00
  • a1bbf5328e Merge pull request #2872 from mkllnk/2765-fix-geocoding Pau Pérez Fabregat 2018-10-22 16:44:30 +02:00
  • d0d9038308 Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2 luisramos0 2018-10-22 11:23:46 +01:00
  • 34d1e6ffdb Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794 luisramos0 2018-10-21 22:13:15 +01:00
  • 7ae5a615b2 Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending luisramos0 2018-10-21 22:09:21 +01:00
  • 6f78f3c595 Move all specs in proxy_order_spec temporarily to pending luisramos0 2018-10-21 22:08:10 +01:00
  • b0ffb0f91a Move all specs in subscription_confirm_job_spec temporarily to pending luisramos0 2018-10-21 22:07:23 +01:00
  • 2e64226d29 Move all specs in spec/features/admin/subscriptions_spec temporarily to pending luisramos0 2018-10-21 22:06:31 +01:00
  • ca786249a6 Move all specs in subscription_form_spec temporarily to pending luisramos0 2018-10-21 22:05:45 +01:00
  • 3afc59c864 Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending luisramos0 2018-10-21 22:04:16 +01:00
  • 5b6b0f408f Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing luisramos0 2018-10-21 22:02:34 +01:00
  • 5d36450de2 Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing luisramos0 2018-10-21 21:56:55 +01:00
  • 92c7db2249 Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem luisramos0 2018-10-20 23:43:33 +01:00
  • f3ef3d0c3e Avoiding variantStock raise by creating variant first and then setting count_on_hand luisramos0 2018-10-20 23:28:22 +01:00
  • 653c67971f Remove order admin page filter 'show only unfulfilled orders' as done on spree 2 luisramos0 2018-10-20 15:11:47 +01:00
  • d375bb8c55 Migration: Revoke variant overrides without permissions luisramos0 2018-10-20 11:48:23 +01:00
  • 9079437284 Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted luisramos0 2018-10-20 11:12:53 +01:00
  • 5ae0ad87a7 Refactor EnterpriseRelationship before save hook: some renames and extract methods luisramos0 2018-10-20 11:12:00 +01:00
  • c3cef699ca Use https on all links in emails in production Matt-Yorkley 2018-10-19 16:49:28 +01:00
  • c911462737 Updating translations for config/locales/en_GB.yml Transifex-Openfoodnetwork 2018-10-20 02:04:33 +11:00
  • c373d5ab33 Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method luisramos0 2018-10-17 12:52:30 +01:00
  • df36e0b344 In cart population, replace usage of global allow_backorders with variant.on_demand adapter luisramos0 2018-10-17 12:30:42 +01:00
  • 32632addfb Merge pull request #2823 from luisramos0/2-0-order-spec-fees Pau Pérez Fabregat 2018-10-18 13:30:15 +02:00
  • a92e8c9923 Improve readability of shipment decorator luisramos0 2018-10-12 17:53:06 +01:00
  • a83af367b4 Fix order_spec related to retrieving previously ordered items luisramos0 2018-10-12 11:35:40 +01:00
  • 74eff8730b Fix tests of fees in a completed order in models/spree/order_spec by: - set distributor with taxes on the order - simplify the factory completed_order_with_fees by replacing shipment with shipping_method and ship_address and letting the order workflow handle shipments and inventory units luisramos0 2018-10-11 17:10:01 +01:00
  • 91f52d80c8 Fix problem in order and adjustment model specs by fixing the order.adjustment association luisramos0 2018-10-11 17:06:10 +01:00
  • 2ccbb87adc Fix payment decorator bug Payment line items must come from the order, payment does not have inventory_units luisramos0 2018-10-11 17:03:19 +01:00
  • 3a2e52cc98 Merge pull request #2780 from luisramos0/2-0-stripe-factory Maikel 2018-10-18 14:54:28 +11:00
  • 01c21c302c Merge pull request #2811 from luisramos0/2-0-adjust-basic-spec-fix Maikel 2018-10-18 14:49:28 +11:00
  • 9698fd3c5a Style spec Maikel Linke 2018-10-18 11:07:16 +11:00
  • d197c8587f Test address deletion Maikel Linke 2018-10-18 11:06:32 +11:00
  • e96cab957a Convert specs to RSpec 3.7.1 syntax with Transpec Maikel Linke 2018-10-18 10:52:46 +11:00
  • fe9f4a1c95 Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead luisramos0 2018-10-17 12:16:33 +01:00
  • c281927372 Fix subscription address form. It now clears the state selection when a different country is selected luisramos0 2018-10-16 23:02:26 +01:00
  • 1804bf5a2b Extract countryStates logic from customer_address modal and re-use new CountryStates service luisramos0 2018-10-16 22:45:38 +01:00
  • 5c5a2194d6 Extract country states logic out of subscriptions address controller into new service CountryStates luisramos0 2018-10-16 21:58:27 +01:00
  • feaf16d878 Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases luisramos0 2018-10-16 17:30:57 +01:00
  • 98161daa90 Refactor duplicated distributors association in payment_method and gateway to a concern luisramos0 2018-10-14 00:57:09 +01:00
  • 419493f153 Move instagram regex to an method to fix codeclimate fabricio.albarnaz 2018-10-16 16:09:15 -03:00
  • 8e4adbd23a Add more test cases fabricio.albarnaz 2018-10-16 15:34:46 -03:00
  • 93a051bf5a Regex ajust fabricio.albarnaz 2018-10-16 15:33:10 -03:00
  • 601e0b927a Merge pull request #2816 from luisramos0/2-0-adjust-enterprise-fees-spec-fix-aplicator Pau Pérez Fabregat 2018-10-16 19:47:10 +02:00
  • 54f0ccab93 Merge pull request #2861 from luisramos0/2-0-stable-spree-revision Pau Pérez Fabregat 2018-10-16 19:41:08 +02:00
  • 3e4f92fe92 Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix Luis Ramos 2018-10-16 17:33:33 +01:00
  • c99fec44da Merge pull request #2824 from luisramos0/2-0-order-spec Pau Pérez Fabregat 2018-10-16 18:09:33 +02:00
  • f2fe3c8cff Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix Pau Pérez Fabregat 2018-10-16 18:02:21 +02:00
  • b3c56e6823 Duplicated payment method distributors association to gateway. This fixes the inheritance problem found in stripe gateway See PR 2780 for more details luisramos0 2018-10-13 23:44:43 +01:00
  • db9669b4ce Merge pull request #2817 from coopdevs/remove-reference-to-on-demand Pau Pérez Fabregat 2018-10-16 17:52:42 +02:00
  • faf8322c59 Merge pull request #2785 from luisramos0/2-0-order-updater-fix Luis Ramos 2018-10-16 16:43:42 +01:00
  • 570016463b Fix order_updater_spec by using create (instead of build) in shipment. Also simplified spec by using prebuild shipment_with and shipping_method factories luisramos0 2018-09-29 23:03:47 +01:00
  • afe1d7caef Merge pull request #2863 from luisramos0/2-0-stable-oct Pau Pérez Fabregat 2018-10-16 17:09:56 +02:00
  • 590091c42a Merge pull request #2842 from Matt-Yorkley/pi/missing_variable Pau Pérez Fabregat 2018-10-16 13:19:23 +02:00
  • 8fb81bb6a7 Configure Geocoder with API key as required by Google Maikel Linke 2018-10-16 16:49:52 +11:00
  • 61797fff56 Restrict deletion of address explicitely Maikel Linke 2018-10-16 15:18:44 +11:00
  • a8705ca179 Simplify address methods Maikel Linke 2018-10-16 12:13:08 +11:00
  • 5021ed9c69 Simplify by using Rails tools Maikel Linke 2018-10-16 12:11:31 +11:00
  • 34849c441a Reduce complexity and duplication Maikel Linke 2018-10-16 12:09:18 +11:00
  • c4437a6437 Style address decorator Maikel Linke 2018-10-16 12:03:11 +11:00
  • b109f6d78c Remove temporary reporting code Maikel Linke 2018-10-16 11:57:21 +11:00
  • 02bc134c59 Change befor save check to format validation fabricio.albarnaz 2018-10-15 17:51:33 -03:00
  • dc6c8ec455 Bump figaro from 0.7.0 to 1.1.1 dependabot[bot] 2018-10-15 19:14:26 +00:00
  • 87cd73ddba Merge branch 'master' into 2-0-stable-oct luisramos0 2018-10-15 17:09:26 +01:00
  • f8bccda6ab Merge pull request #2847 from Matt-Yorkley/emails/validation Pau Pérez Fabregat 2018-10-15 15:54:41 +02:00
  • a5a2cb8ea7 Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up" Pau Perez 2018-10-15 15:48:48 +02:00
  • 8946fe3ce8 Merge pull request #2829 from Matt-Yorkley/bi/results_per_page Pau Pérez Fabregat 2018-10-15 12:17:39 +02:00
  • 0e4a3dbc26 Merge pull request #2845 from coopdevs/fix-invalid-variant-creation Pau Pérez Fabregat 2018-10-15 12:16:39 +02:00
  • fa689b6607 Merge pull request #2856 from luisramos0/2-0-adjust-clean-up Pau Pérez Fabregat 2018-10-15 11:13:46 +02:00