raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,432 Commits 21 Branches 450 Tags
ea0d24a5bfdf1c06c8bfd28f48e0438b7cad9c19
Commit Graph

9432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt-Yorkley
d90e362e6f Remove guest checkout radio buttons from admin order view 2018-06-09 02:43:42 +01:00
Matt-Yorkley
7bef474efd Admin Order guest checkout status 2018-06-09 02:43:42 +01:00
Pau Pérez Fabregat
4c9dd4e8a1 Merge pull request #2349 from robotscissors/issue-2278-add-missing-image 
Add image back into server for background
 2018-06-08 19:12:01 +02:00
Pau Pérez Fabregat
bb3ae976c6 Merge pull request #2364 from coopdevs/update-template 
Ask devs to tell whether we should test on mobile
 2018-06-08 14:37:16 +02:00
Pau Perez
fed60cf961 Ask devs to tell whether we should test on mobile 2018-06-08 10:01:04 +02:00
Pau Pérez Fabregat
b77091f87d Merge pull request #1969 from coopdevs/feature/do-not-upcase-state-abbr 
Do not upcase State abbreviation
 2018-06-08 08:36:55 +02:00
Rob Harrington
5cbc4cbf30 Use scoped keys for table headers in saved card partial 2018-06-08 15:30:08 +10:00
Rob Harrington
18c211e97c Ensure that savedCreditCards always exists 2018-06-08 15:30:08 +10:00
Rob Harrington
6a202d9446 Use more descriptive name for after_save callback method: :ensure_single_default_card 2018-06-08 15:30:08 +10:00
Rob Harrington
5dbf98f39b Use exists? method to avoid unnecesary loading of credit card array 2018-06-08 15:30:07 +10:00
Rob Harrington
05e4d9007e Update card spec to make the initial roles of cards clearer 2018-06-08 15:30:07 +10:00
Rob Harrington
254f0db97c Automatically select the customer's default card in the checkout 2018-06-08 15:30:07 +10:00
Rob Harrington
e88e963b4c Alter cards interface to allow updating of default card 2018-06-08 15:30:07 +10:00
Rob Harrington
1327b9dc2c Add update method to CreditCardsController 2018-06-08 15:30:07 +10:00
Rob Harrington
d146d3714f Add callbacks to ensure a user always has a default credit card 
(if any exist)
 2018-06-08 15:30:01 +10:00
robotscissors
5c25e85d92 Create dark background on load 2018-06-07 21:53:17 -07:00
Rob Harrington
3619ec0dc8 Add is_default attribute to Spree::CreditCard model 2018-06-08 12:01:10 +10:00
Pau Pérez Fabregat
d4e0d14fe1 Merge pull request #2342 from openfoodfoundation/transifex 
Transifex
 2018-06-06 09:05:29 +02:00
Pau Pérez Fabregat
7ff7fe4891 Merge pull request #2122 from oeoeaio/subs-unplaced-fees 
Subs: prevent fees from displaying in email when subscription order cannot be fulfilled
 2018-06-06 07:57:18 +02:00
Maikel
9d2c1976e0 Merge pull request #2343 from mkllnk/2212-remove-report-default-filters 
2212 remove report default filters
 2018-06-06 12:19:47 +10:00
Maikel
494aeb9a14 Merge pull request #2348 from oeoeaio/fix-tabs 
Provide specific tab widths for shop tabs when screen width > medium
 2018-06-05 15:27:40 +10:00
Pau Pérez Fabregat
3283c5158b Merge pull request #1492 from Matt-Yorkley/uk/import2 
Uk/import2
 2018-06-04 09:56:36 +02:00
Pau Pérez Fabregat
cf77bb439a Merge pull request #2337 from Matt-Yorkley/uk/modal_fix 
Fix guest checkout login modal
 2018-06-04 09:56:00 +02:00
Pau Pérez Fabregat
ed116867d4 Merge pull request #2322 from luisramos0/issue1913 
Fixed issue #1913 with expand/collapse of list of producers of a shop
 2018-06-04 09:55:40 +02:00
Rob Harrington
fed0a81159 Add an optional link to Skylight dashboard to footer 2018-06-02 11:55:28 +10:00
Rob Harrington
e3ea60fda5 Process proxy orders even if underlying subscription has been paused or cancelled 2018-06-01 16:57:56 +10:00
robotscissors
65e13c2a2d add image back into server for background 2018-05-30 20:42:31 -07:00
Rob Harrington
8201da9fab Prodide specific tab widths for shop tabs when screen width > medium 2018-05-30 17:05:31 +10:00
Rob Harrington
184bf9ce36 Allow super admin users to enable subscriptions for enterprises 2018-05-30 09:42:03 +10:00
Rob Harrington
16211da5f6 Reimplement tabs on shopfront using our custom tab directive 2018-05-30 08:35:21 +10:00
Maikel
cb19643b3a Merge pull request #2332 from oeoeaio/1938-oc-switch 
Correct 'Next Order Closing' text in shopfront when switching OCs
 2018-05-30 08:28:23 +10:00
Maikel
cee2f76406 Merge pull request #2299 from frank-west-iii/issue-1832-phone-shopfront 
Add phone number to shopfront contact info
 2018-05-30 08:27:07 +10:00
Maikel
32ef507221 Merge pull request #2318 from luisramos0/issue2307 
Fixed broken translation keys in "new order cycle" screen
 2018-05-29 17:38:04 +10:00
Maikel
603c88a93c Merge pull request #2317 from luisramos0/issue2308 
Added missing translation key for no results in admin orders page
 2018-05-29 17:37:26 +10:00
Maikel
307132d1f7 Merge pull request #2298 from frank-west-iii/issue-953-ent-description-formatting 
Fix enterprise description display formatting
 2018-05-29 17:36:47 +10:00
Maikel Linke
e6ef43c91d Give a spec some style 2018-05-29 16:55:30 +10:00
Maikel Linke
54bdcf7679 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/lib/open_food_network/xero_invoices_report_spec.rb

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

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

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

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

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-05-29 16:53:18 +10:00
Maikel Linke
72ae6f2af6 Add spec helper to make spec run on its own 2018-05-29 16:49:00 +10:00
Maikel Linke
02c4795640 Remove default dates from reports 
Closes https://github.com/openfoodfoundation/openfoodnetwork/issues/2212
 2018-05-29 16:47:23 +10:00
Transifex-Openfoodnetwork
6d450aeae2 Updating translations for config/locales/pt.yml 2018-05-29 14:53:01 +10:00
Transifex-Openfoodnetwork
d1e9d52acd Updating translations for config/locales/fr.yml 2018-05-29 14:51:07 +10:00
Matt-Yorkley
b440d05205 Tidy up unnecessary PI code 2018-05-26 19:34:20 +01:00
Matt-Yorkley
a4a2bc438a Import settings spec 2018-05-26 19:34:20 +01:00
Matt-Yorkley
a503b5e2d0 Add not_master scope to Spree::Variant 2018-05-26 19:34:20 +01:00
Matt-Yorkley
91521dc2b0 Improve import_date queries 2018-05-26 19:34:20 +01:00
Matt-Yorkley
6f6db9384f Tidy up SCSS and coffeescript 2018-05-26 19:34:20 +01:00
Matt-Yorkley
d9c720e89a Tidy up import_date 2018-05-26 19:34:20 +01:00
Matt-Yorkley
73f7bc3db0 Remove use of before_filter 2018-05-26 19:34:20 +01:00