summerscope
e6d00e00c4
WIP button tweaks for new look & feel
2015-05-02 18:25:38 +10:00
summerscope
ddde4e9dcb
WIP producers signup page markup
2015-05-02 18:25:23 +10:00
summerscope
3dbe45172d
Registration markup tweak with new icons
2015-05-02 18:24:55 +10:00
summerscope
2db6d5fe65
Registration styling tweak for new look & feel
2015-05-02 18:24:40 +10:00
summerscope
6d904b4700
Adding in styling for signup panes for Producers and Hubs
2015-05-02 18:24:18 +10:00
summerscope
4cb0158b21
Add in link for Regional founders user types - to send back to global site
2015-05-02 18:23:42 +10:00
summerscope
4f145104d2
Update mailer to new logo - should be instance specific (e.g. UK, AUS, etc.)
2015-05-02 17:58:35 +10:00
summerscope
fd90da6868
Shops landing page - adding info pane and copy with Jay.
2015-05-02 16:02:18 +10:00
summerscope
330d23c606
Move alert for 'join now' off global template onto homepage template only.
2015-05-02 15:23:12 +10:00
summerscope
5f193bc9ae
More styling for homepage panes.
2015-05-02 15:20:51 +10:00
summerscope
0086066ea5
WIP on How does it work pane on homepage
2015-05-02 13:58:57 +10:00
summerscope
5198d52f0d
Design assets for new UI
2015-05-02 13:58:47 +10:00
summerscope
7b8b53854e
More WIP on homepage layout etc.
2015-05-01 18:46:39 +10:00
summerscope
03508f98d8
Homepage tagline styling for mobile / responsive
2015-05-01 18:24:07 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
Maikel Linke
11acb3ba59
Allow to remove adjustments
...
Managers of an order cycle and the distributor of an order are allowed
to remove an adjustment from the order.
2015-05-01 15:59:46 +10:00
Maikel Linke
2edf5aeccd
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-01 15:05:14 +10:00
Maikel Linke
993183f2f5
updating js spec: cloning product calls insertProductAfter now
2015-05-01 15:04:12 +10:00
Rohan Mitchell
e91de69d5a
Merge branch 'master' into pin-refunds
2015-05-01 14:58:19 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25
2015-05-01 14:55:26 +10:00
summerscope
d9fd0b284d
WIP on home panes and layout
2015-05-01 14:52:17 +10:00
Maikel Linke
7c55285708
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-01 14:50:51 +10:00
Maikel Linke
e6e063670c
Allow managers to remove line items from order
...
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
2015-05-01 14:49:34 +10:00
summerscope
e1beae98ab
WIP on redesign / layout job
...
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
2015-05-01 14:41:48 +10:00
Rohan Mitchell
153604dd64
Merge branch 'single-order-patches'
2015-05-01 14:39:17 +10:00
Maikel Linke
b7bac326bd
admin order edit: re-label update button to "update and recalculate fees"
2015-05-01 12:05:43 +10:00
Rohan Mitchell
a6cecdcc25
Display header for Xero invoices report
2015-05-01 11:59:52 +10:00
Maikel Linke
baabb5c07f
fixing BPE feature spec
2015-05-01 11:30:26 +10:00
Rohan Mitchell
91ca5f0213
Fix specs for receival_time / instructions
2015-05-01 10:08:24 +10:00
Rohan Mitchell
f5b45fa0ba
Merge branch 'master' into folklabs-producer-emails
2015-05-01 09:51:01 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
summerscope
ae16589717
New version of logo sliced for OFN Australia
2015-04-30 17:55:18 +10:00
Maikel Linke
66f847f673
showing save button at the bottom as well
2015-04-30 17:22:54 +10:00
Maikel Linke
af78859db6
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-30 17:18:02 +10:00
Maikel Linke
295da25dd2
insert clone after cloned product
2015-04-30 17:17:28 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Rohan Mitchell
2c7a5c0656
Update Spree - fixes bug where Payment#method_missing depends on #provider already called.
2015-04-30 15:49:48 +10:00
Rohan Mitchell
0b652a2113
Add refund icon
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b498c28632
Payments can be refunded
2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2
Pin payments can't void or credit, but they can refund
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b09ae550c8
Add spec for payment actions
2015-04-30 15:49:48 +10:00
Rohan Mitchell
f4df227ef0
Buildkite should now support Fuubar
2015-04-30 13:54:27 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
73376b30e2
Convention
2015-04-29 15:56:27 +10:00
Rohan Mitchell
3565548e91
Extract data preparation into private methods
2015-04-29 15:50:42 +10:00
Rohan Mitchell
6999bcfd4e
Only include complete orders in producer mailer report
2015-04-29 15:43:50 +10:00
Rohan Mitchell
2fe5d7c73f
Remove commented code, use neater syntax for accessing Spree config var
2015-04-29 15:33:39 +10:00
Rohan Mitchell
3a3bf19cf8
Clean up duplication
2015-04-29 15:31:42 +10:00
Rohan Mitchell
30e04b509d
Clean up routes
2015-04-29 15:31:13 +10:00
Rohan Mitchell
4279742de5
Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob
2015-04-29 15:21:05 +10:00
