From 20339bac2234268bcf1d6d9b5f4d183b845c88cf Mon Sep 17 00:00:00 2001 From: Dominik Horniak Date: Mon, 18 Jul 2016 17:02:54 +0200 Subject: [PATCH 1/7] Added referer email to merchant show campaign --skip-ci --- app/models/link.rb | 2 ++ app/models/sell_action.rb | 2 ++ app/views/campaigns/partials/_show.html.erb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/models/link.rb b/app/models/link.rb index 14f1b6a..782bfa9 100644 --- a/app/models/link.rb +++ b/app/models/link.rb @@ -4,6 +4,8 @@ class Link < ActiveRecord::Base has_many :open_actions has_many :sell_actions + delegate :email, to: :user, prefix: true, allow_nil: true + def self.get_by_code(code) Link.where(code: code).first end diff --git a/app/models/sell_action.rb b/app/models/sell_action.rb index 38d8768..fa7b7a7 100644 --- a/app/models/sell_action.rb +++ b/app/models/sell_action.rb @@ -3,6 +3,8 @@ class SellAction < ActiveRecord::Base before_create :set_approved_at + delegate :user_email, to: :link, allow_nil: true + enum payment_method: { transfer: 0, paypal: 1 } def self.getOrCreate(code, link, email, price) diff --git a/app/views/campaigns/partials/_show.html.erb b/app/views/campaigns/partials/_show.html.erb index 7a94a63..d1aa43d 100644 --- a/app/views/campaigns/partials/_show.html.erb +++ b/app/views/campaigns/partials/_show.html.erb @@ -30,6 +30,7 @@ Kód Email + Email referer Zaznamenie Cena (€) Provizia (%) @@ -40,6 +41,7 @@ <%= record[:code] %> <%= record[:email] %> + <%= record.user_email %> <%= record[:created_at].strftime("%d.%m.%Y %H:%M") %> <%= record[:price] %> <%= record[:commission] %> From 7ad10e6bd528290c1fcf4d4a1e986a62b85f96b8 Mon Sep 17 00:00:00 2001 From: Dominik Horniak Date: Mon, 18 Jul 2016 18:17:33 +0200 Subject: [PATCH 2/7] Fixed commissions controller --skip-ci --- app/controllers/commissions_controller.rb | 2 ++ app/views/links/index.html.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/commissions_controller.rb b/app/controllers/commissions_controller.rb index b84aef6..9841d47 100644 --- a/app/controllers/commissions_controller.rb +++ b/app/controllers/commissions_controller.rb @@ -37,5 +37,7 @@ def pay session.delete(:sell_action_ids) session.delete(:commission) + + redirect_via_turbolinks_to links_path end end diff --git a/app/views/links/index.html.erb b/app/views/links/index.html.erb index 8107264..ef9e5e3 100644 --- a/app/views/links/index.html.erb +++ b/app/views/links/index.html.erb @@ -33,7 +33,7 @@

- <%= @data[:links][:commission] %>€ provízia + <%= @data[:links][:eligible_commission] %>€ aktuálna provízia <% if eligible_for_payoff %><% end %>
From 3d11a3dd8e601d1c07306e5afb052e1131e6cc12 Mon Sep 17 00:00:00 2001 From: mtakac Date: Mon, 18 Jul 2016 23:43:51 +0200 Subject: [PATCH 3/7] Fixes in campaign link index table headers --skip-ci --- app/views/campaigns/partials/_show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/campaigns/partials/_show.html.erb b/app/views/campaigns/partials/_show.html.erb index d1aa43d..0be5629 100644 --- a/app/views/campaigns/partials/_show.html.erb +++ b/app/views/campaigns/partials/_show.html.erb @@ -30,8 +30,8 @@ Kód Email - Email referer - Zaznamenie + Referer + Zaznamenané Cena (€) Provizia (%) Provizia (€) @@ -59,4 +59,4 @@ $.get("<%= sell_actions_set_approve_path %>", {id: id, approve: isChecked}).done(function(data) {}); }); }); - \ No newline at end of file + From 5e0ac961101f01b20b1684fad77308e6d4b355e6 Mon Sep 17 00:00:00 2001 From: mtakac Date: Tue, 19 Jul 2016 14:25:59 +0200 Subject: [PATCH 4/7] Bugfix in sharee button initialization --- app/models/user.rb | 4 ++-- public/sharee.js | 2 +- public/sharee/styles.css | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 0558028..f6a94fd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,7 @@ class User < ActiveRecord::Base has_many :campaigns has_many :links has_one :billing_info - + accepts_nested_attributes_for :billing_info enum role: { merchant: 0, referer: 1 } @@ -24,7 +24,7 @@ def self.get_or_create_by_email(email, role) end user end - + after_initialize do |user| if user.merchant? && user.billing_info.blank? user.billing_info = BillingInfo.create! diff --git a/public/sharee.js b/public/sharee.js index 6dbdb39..df24389 100644 --- a/public/sharee.js +++ b/public/sharee.js @@ -5,7 +5,7 @@ $(function() { $(document).ready(ready); $(document).on('page:load', ready); -}); +})(); window.Sharee = (function () { 'use strict'; diff --git a/public/sharee/styles.css b/public/sharee/styles.css index 421e036..f07a668 100644 --- a/public/sharee/styles.css +++ b/public/sharee/styles.css @@ -4,7 +4,6 @@ .sharee-button { display: inline-block; - margin: 4px; } .sharee-button-block { @@ -188,4 +187,4 @@ .sharee-gp { border-color: rgb(215, 61, 50); background: rgb(215, 61, 50); -} \ No newline at end of file +} From e99a368333e1954fdcd72900487df647fbc1171a Mon Sep 17 00:00:00 2001 From: mtakac Date: Tue, 19 Jul 2016 14:31:25 +0200 Subject: [PATCH 5/7] Bugfix in sharee button initialization --- public/sharee.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/public/sharee.js b/public/sharee.js index df24389..dbfd7eb 100644 --- a/public/sharee.js +++ b/public/sharee.js @@ -1,12 +1,3 @@ -$(function() { - var ready = function() { - new Sharee(); - }; - - $(document).ready(ready); - $(document).on('page:load', ready); -})(); - window.Sharee = (function () { 'use strict'; @@ -224,3 +215,12 @@ window.Sharee = (function () { return Sharee; })(); + +$(function() { + var ready = function() { + new Sharee(); + }; + + $(document).ready(ready); + $(document).on('page:load', ready); +}); From 6675c3a3a799b01e11c7ed511a937ccb3ef45f0e Mon Sep 17 00:00:00 2001 From: Dominik Horniak Date: Fri, 22 Jul 2016 13:14:04 +0200 Subject: [PATCH 6/7] Fixed sharee public JS script --- public/sharee.js | 60 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/public/sharee.js b/public/sharee.js index dbfd7eb..4715ae5 100644 --- a/public/sharee.js +++ b/public/sharee.js @@ -63,17 +63,47 @@ window.Sharee = (function () { initShareeButtonFormsEvents(button); }); }); + + $(document).on('click', '.sharee-fb', function(e) { + e.preventDefault(); + var url = 'https://www.facebook.com/sharer/sharer.php?u=' + getShareeUrl(this); + window.open(url,'_blank','width=800,height=300'); + }); - appendScripts(); - appendStyles(); - }; + $(document).on('click', '.sharee-tw', function(e) { + e.preventDefault(); + var url = 'http://twitter.com/share?url=' + getShareeUrl(this) + '&text=Sharing'; + window.open(url,'_blank','width=800,height=300'); + }); - var appendScripts = function() { - var head = getDocumentHead(); - var script= document.createElement("script"); - script.type = "text/javascript"; - script.src= Sharee.getHost() + "/sharee/scripts.js"; - head.appendChild(script); + $(document).on('click', '.sharee-gp', function(e) { + e.preventDefault(); + var url = 'https://plus.google.com/share?url=' + getShareeUrl(this); + window.open(url,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=400,width=500'); + }); + + function isEmail(email) { + var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/; + return regex.test(email); + } + + $( document ).ready(function() { + $('#sharee-submit-email').prop('disabled', true); + }); + + $('.sharee-button').on('input', '#sharee-input-email', function(){ + console.log($(this).val()); + if(($(this).val().length != 0) && isEmail($(this).val())) + $('#sharee-submit-email').prop('disabled', false); + else + $('#sharee-submit-email').prop('disabled', true); + }); + + var getShareeUrl = function(sender) { + return $(sender).closest('.sharee-button-success-block').find('.sharee-link').val(); + }; + + appendStyles(); }; var appendStyles = function() { @@ -216,11 +246,9 @@ window.Sharee = (function () { return Sharee; })(); -$(function() { - var ready = function() { - new Sharee(); - }; +var ready = function() { + new Sharee(); +}; - $(document).ready(ready); - $(document).on('page:load', ready); -}); +$(document).ready(ready); +$(document).on('page:load', ready); From 1978ffa1afdc7ef54c7267d86f61745c9844db8e Mon Sep 17 00:00:00 2001 From: Dominik Horniak Date: Fri, 22 Jul 2016 14:12:34 +0200 Subject: [PATCH 7/7] Deleted consolelog from sharee.js --- public/sharee.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/sharee.js b/public/sharee.js index 4715ae5..8791a3d 100644 --- a/public/sharee.js +++ b/public/sharee.js @@ -92,7 +92,6 @@ window.Sharee = (function () { }); $('.sharee-button').on('input', '#sharee-input-email', function(){ - console.log($(this).val()); if(($(this).val().length != 0) && isEmail($(this).val())) $('#sharee-submit-email').prop('disabled', false); else