raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,904 Commits 18 Branches 451 Tags
e00a3ee263bbb364fddea1ed4e1498e9178e859d
Commit Graph

247 Commits

Author SHA1 Message Date
Maikel
b7abb72ed5 Merge pull request #3462 from luisramos0/delete-api-order-ctrl 
Delete empty controller class eval and spec
 2019-02-19 11:14:29 +11:00
Maikel Linke
5f5b0aaabf Simplify specs with stripe factory 2019-02-13 18:34:22 +11:00
Kristina Lim
461b5725d1 Hide report link and resource from non-superadmins 2019-02-08 21:26:38 +00:00
Kristina Lim
eaa7800427 Do not assign I18n translation to constants 
The preferred language could change dynamically.
 2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a Separate enterprise fee summary action 
Split the previous "index" action into "new" and "create" actions.
 2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131 Rename EnterpriseFeeSummaryReportController 
Remove "Report" because this is redundant, and pluralize the resource
name.
 2019-02-08 21:26:38 +00:00
Kristina Lim
d3e9a53120 Filter enterprise fee summary for user permissions 2019-02-08 21:26:37 +00:00
Kristina Lim
f81f4b7e4a Authorize filters before generating enterprise fee report 2019-02-08 21:26:37 +00:00
Kristina Lim
ec81e4221f Add basic action for enterprise fee summary 2019-02-08 21:26:37 +00:00
luisramos0
3dc75c88d2 Delete empty controller class eval and spec. Useless left overs from 0ad2978926 2019-02-08 09:29:58 +00:00
Matt-Yorkley
2c3eeec2b9 Update cancan permissions for second iteration of bulk invoices 2019-02-06 18:19:53 +00:00
Matt-Yorkley
66ac61f591 Rename background processing method 2019-01-10 09:57:06 +00:00
Matt-Yorkley
4f9f8adcd6 Add Service and remove Job 2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657 Move bulk invoice to new RESTful route 2019-01-10 09:57:06 +00:00
Hugo Daniel
65dd3eb5b9 Change line items controller HTML response spec to look for form order_edit class 2018-11-28 10:31:47 +01:00
Hugo Daniel
4e29589be0 Add specs for cloning a product with image 2018-11-15 13:51:40 +01:00
Pau Pérez Fabregat
3b85bbe911 Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs 
Extract email setup in specs for easy upgrade
 2018-11-02 15:40:19 +01:00
Matt-Yorkley
29492d61f9 Use #allow syntax 2018-10-26 21:38:57 +01:00
Matt-Yorkley
8c19d1afec Move tests from spree/admin/orders_controller_spec to api/orders_controller_spec and tidy up 2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee Refactor Spree::Admin::OrdersController 2018-10-26 21:38:57 +01:00
Maikel Linke
e6adb8a3b9 Extract email setup in specs for easy upgrade 
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
 2018-10-25 13:53:22 +11:00
Pau Perez
cbac916e66 Validate unit value when updating variant_unit 
Variants whose product's variant_unit is weight or volume require
a unit_value.
 2018-10-11 15:52:40 +02:00
Matt-Yorkley
b2551b4e0b Rewrite existing specs 2018-09-19 13:00:30 +01:00
Kristina Lim
cd41498da9 Ask to login when not authenticated for order page 
Redirect the user to the login page, instead of responding with HTTP
401.
 2018-09-06 16:26:48 +08:00
Kristina Lim
3bf9e95511 Add specs for existing behaviour in order page 2018-09-06 16:26:45 +08:00
Kristina Lim
28d2bb3d47 Wrap controller specs for viewing cart 2018-09-06 15:04:11 +08:00
Maikel
a37931afda Merge pull request #2542 from luisramos0/add_to_cart 
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
 2018-08-24 14:43:33 +10:00
luisramos0
ec069b1e3e Converted specs to latest rspec syntax 2018-08-23 12:39:58 +01:00
luisramos0
6caa361354 Moved Spree::OrderController.populate to new CartController. 
This was done to make order populate independent of Spree::OrdersController
 2018-08-23 12:37:52 +01:00
Grey Baker
468c29b8c1 Use new basic auth stub style 2018-08-22 21:35:56 +01:00
Rob Harrington
c496d0f14d Allow credit owed on payments made via stripe to be refunded via the admin section 2018-07-03 14:21:58 +10:00
Maikel Linke
bbe21b7804 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel 2018-06-20 10:31:17 +10:00
Frank West
8324b00999 Renames product bulk edit action to index 
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.

It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
 2018-06-19 17:51:23 +10:00
Matt-Yorkley
ea0d24a5bf Re-word test names for clarity 2018-06-12 13:20:00 +01:00
Matt-Yorkley
c7f7541e2d Admin order customer details spec 2018-06-10 02:32:59 +01:00
Rob Harrington
1327b9dc2c Add update method to CreditCardsController 2018-06-08 15:30:07 +10:00
Pau Perez
889199a525 Refactor Overview Controller to make it more clear 
Assigns meaningful names to the boolean conditions to make it easier
to understand, breaks down the big and nested if/else and converts the
specs to RSpec 3.

Note the check `!spree_current_user.admin?` has been removed because
in admin/base_controller_decorator.rb `#authorize_admin` is already
called.
 2018-05-22 10:21:35 +02:00
Maikel Linke
40b0a0bd5a Determine searching state by params, not request 
We may want to use GET for searching or POST to display a certain report
type.
 2018-05-18 11:27:48 +10:00
Maikel Linke
8a1a540f3d Clarify creating objects for test context 2018-05-18 11:27:48 +10:00
Maikel Linke
8a4457e8e4 Give better names 2018-05-18 11:27:48 +10:00
Maikel Linke
1e80487afc Compile Order And Distributors only on search 
And move most logic into the report class like the others.
 2018-05-18 11:27:47 +10:00
Maikel Linke
53436024e2 Compile Orders & Fulfillment report only on search 2018-05-18 11:27:47 +10:00
Maikel Linke
feb33c3ca5 Compile Payments report only on search 2018-05-18 11:27:47 +10:00
Maikel Linke
bf74282e5f Compile Bulk Co-Op report only on search 2018-05-18 11:27:47 +10:00
Maikel Linke
5f9d239f19 Compile Products & Inventory report only on search 2018-05-18 11:27:47 +10:00
Maikel Linke
d464216027 Don't compile Sales Tax report data before search 2018-05-18 11:27:47 +10:00
Maikel Linke
983e128d90 Half test run time by loading less data 
On my computer it took 3 seconds to load all four orders with all the
attached order cycles and enterprises.

Runtime before: 56.38 seconds
Runtime after:  25.14 seconds

This really speeds up developing reports.
 2018-05-18 11:27:47 +10:00
Maikel Linke
14e7cdd138 Don't compile customers report data before search 
Distributors, suppliers and order cycles are still loaded for the search
form.
 2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0 Don't compile user-enterprises report before search 2018-05-18 11:27:47 +10:00
Maikel Linke
99a6afd9cd Convert specs to RSpec 3.7.0 syntax with Transpec 
This conversion is done by Transpec 3.3.0 with the following command:
    transpec spec/controllers/spree/admin/reports_controller_spec.rb

* 20 conversions
    from: obj.should
      to: expect(obj).to

* 14 conversions
    from: obj.should_not
      to: expect(obj).not_to

* 5 conversions
    from: == expected
      to: eq(expected)

* 4 conversions
    from: obj.stub(:message)
      to: allow(obj).to receive(:message)

* 2 conversions
    from: obj.should_receive(:message)
      to: expect(obj).to receive(:message)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-05-18 11:27:46 +10:00