From 571fce83fdd947acc69e0861190d020dcac21029 Mon Sep 17 00:00:00 2001 From: benji Date: Mon, 21 Sep 2015 12:25:27 +0200 Subject: [PATCH 1/4] Add warning for testfase --- app/assets/stylesheets/overview.css.scss | 5 +++++ app/views/orders/overview.html.haml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/assets/stylesheets/overview.css.scss b/app/assets/stylesheets/overview.css.scss index 62e4d98..37b2b72 100644 --- a/app/assets/stylesheets/overview.css.scss +++ b/app/assets/stylesheets/overview.css.scss @@ -19,3 +19,8 @@ width: 150px; } } + +.warning { + border: 2px solid; + margin-bottom: 20px; +} diff --git a/app/views/orders/overview.html.haml b/app/views/orders/overview.html.haml index 5327de7..734fbfe 100644 --- a/app/views/orders/overview.html.haml +++ b/app/views/orders/overview.html.haml @@ -1,4 +1,6 @@ = render partial: 'flash' +.warning.center + %h1 TESTFASE | GELIEVE STREEPJES TE BLIJVEN ZETTEN | TESTFASE .row - @users.each do |user| = render 'users/new_order', user: user From f05c25e405a863821c8e706bac6f1c3e18303aa1 Mon Sep 17 00:00:00 2001 From: benji Date: Mon, 21 Sep 2015 12:46:39 +0200 Subject: [PATCH 2/4] tab callback for user balance --- app/models/user.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index b98deb9..d2d7344 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -45,6 +45,18 @@ class User < ActiveRecord::Base end def debt - 42.15 + @balance || begin + headers = { + "Authorization" => "Token token=#{Rails.application.secrets.tab_api_key}", + "Content-type" => "application/json" + } + result = HTTParty.get(File.join(Rails.application.config.api_url, "users", "#{name}.json"), headers: headers) + + if result.code == 200 + JSON.parse(result.body)["balance"] + else + 0 + end + end end end From ec2174171d3ff8264e1949777dd2b7b2c1ce35df Mon Sep 17 00:00:00 2001 From: benji Date: Mon, 21 Sep 2015 12:48:30 +0200 Subject: [PATCH 3/4] format balance --- app/models/user.rb | 2 +- app/views/layouts/_header.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index d2d7344..6459040 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -44,7 +44,7 @@ class User < ActiveRecord::Base end end - def debt + def balance @balance || begin headers = { "Authorization" => "Token token=#{Rails.application.secrets.tab_api_key}", diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 04abf65..2391e6d 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -42,7 +42,7 @@ %li= link_to "Edit avatar", edit_user_path(current_user) %li %p.navbar-text - Debt: #{euro(current_user.debt)} + Balance: #{euro_from_cents(current_user.balance)} .visible-xs.navbar-form .form-group - if user_signed_in? From 5a538a924b5113d6da0e3d7f370b3667346c665f Mon Sep 17 00:00:00 2001 From: benji Date: Mon, 21 Sep 2015 13:00:22 +0200 Subject: [PATCH 4/4] oops --- app/views/orders/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/orders/new.html.haml b/app/views/orders/new.html.haml index 26df01a..6855558 100644 --- a/app/views/orders/new.html.haml +++ b/app/views/orders/new.html.haml @@ -1,5 +1,5 @@ %h3 - Order for #{@user.name} (Huidige schuld: #{euro(@user.debt)}) + Order for #{@user.name} (Huidige schuld: #{euro_from_cents(@user.balance)}) .row = f_form_for [@user, @order] do |f| = f.error_messages