raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 454 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

14886 Commits

Author SHA1 Message Date
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
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
02c4795640 Remove default dates from reports 
Closes https://github.com/openfoodfoundation/openfoodnetwork/issues/2212
 2018-05-29 16:47:23 +10: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
Matt-Yorkley
c5b7cec19f Change checkbox confirmation behaviour 2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9 Product Import Guide WIP 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2 Create separate angular module 2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a Product Import refactor 2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e Refactor PI 2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a6f316ede Codeclimate refactor 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7c283d90db Spec adjustments 2018-05-26 19:34:19 +01:00
Matt-Yorkley
1c34ce6162 PI exception handling 2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400 PI inventories UX 
Minor tweaks
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
2ef63efe28 Tax and Shipping adjustments 2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3 PI human-readable unit fields 
Enhanced unit specs
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
02661d5c23 PI unit_value typecasting 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e848957712 Clean up PI controller 
Remove assignment

Tweak
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4 Product Import v3 with asynchronous processing 
Fixed spec

Quick spec tweak
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
684b493fb3 PI translations 2018-05-26 19:34:19 +01:00
Matt-Yorkley
6e2de0d6ac PI refactoring 2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480 PI inventories additions 2018-05-26 19:34:19 +01:00
Matt-Yorkley
4e97445655 PI inventories timestamps 2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900 PI inventories and overhaul 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867 PI timestamps 2018-05-26 19:34:19 +01:00
Matt-Yorkley
fc2cc09ea5 checkout redirect excludes angular path variables 2018-05-26 18:13:35 +01:00
luisramos0
533ae77234 Fixed missing translations on shops filter - delivery option 2018-05-25 23:46:44 +01:00
Pau Pérez Fabregat
e04141d797 Merge pull request #2291 from coopdevs/remove-producers-tab-from-dashboard 
Remove producers tab from dashboard
 2018-05-25 19:24:29 +02:00
Rob Harrington
17259b3269 Overwrite cached value for current_order_cycle when updating it 
This ensures that the correct order cycle is rendered in the json response
 2018-05-25 17:28:54 +10:00
luisramos0
d821664ee3 Fixed issue #1913 with expand/collapse of list of producers of a shop 2018-05-23 17:32:38 +01:00
luisramos0
a59d9cb670 Fixed broken translation keys in new order cycle screen 2018-05-23 13:12:56 +01:00
Pau Perez
2a3772dba0 Do not show icons for producer-enterprises 
Payment and shipping methods don't apply to them.
 2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd Ensure non-distributors are listed in dashboard 
We want to show all enterprises in a single list regardless of their
type.
 2018-05-22 10:21:35 +02:00
Pau Perez
bd34f27ace Inline partials into enterprises view 
Now there are no tabs in the dashboard so is pointless to refer to them
and to split in multiple partials.
 2018-05-22 10:21:35 +02: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
Pau Perez
51f3542a92 Remove no longer used Angular controller 
There are no tabs to keep track of now.
 2018-05-22 10:21:35 +02:00
Pau Perez
5a182e8e88 Remove enterprises producers tab from dashboard 2018-05-22 10:21:35 +02:00