fly_admin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77d4bfef9a60cbba77bf284fb516615d4739988
-  data.tar.gz: ea265618ee342dfab5359b0e148f31fc449567d5
+  metadata.gz: fe790ccb88c3b854aaa5eb9ed37b9cb767615443
+  data.tar.gz: 6087c084c181e4fb08e862b4c26a874dc3a38078
 SHA512:
-  metadata.gz: 57b734ff2b8ae61112eb10dd4ec9834b992535b6aaffda44a717cdc763f1fe9c5c906b6bff1b9fec9bc10cd0d751173fa9358f684b9257966060c8eae511cb89
-  data.tar.gz: c9d0f7b26afea82b82faacfaadf52983fbd8d81636c0afbf0cd45c27c41b3207b33b29fb2f4bcb27040d934a5aa7d6aa27122bc1244d76e9aeeaf87c4bd366aa
+  metadata.gz: d925a5ed3de9b1ef130a2b88a32e270d8b221a609c94109d3f264e8eefb08186346432119364784d2902939b4c1ca7d0dd383b771e4765fb2d1739c976080129
+  data.tar.gz: 2fe7947394dfd4af2b481988559d9db6cb405ad6930333ffaaed392e717cf918ad384216342bdffa0d2d7c5d1976c1da1f7db65bd8ce84a6c2bf8092e1a61306

data/app/assets/stylesheets/fly_admin/fly_admin.less

@@ -11,6 +11,10 @@
   margin: 10px !important;
 }
 
+.margin-left-10 {
+  margin-left: 10px !important;
+}
+
 .btn-for-link {
   padding: 6px 12px !important;
 }

data/app/assets/stylesheets/fly_admin/jstree/default/style.css.erb

@@ -154,7 +154,7 @@
   box-shadow: 0 0 2px #0a6aa1;
 }
 .vakata-context li > a.vakata-context-parent {
-  background-image: url(<%= asset_path "data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==" %>);
   background-position: right center;
   background-repeat: no-repeat;
 }
@@ -232,7 +232,7 @@
   margin-right: -4px;
 }
 .vakata-context-rtl li > a.vakata-context-parent {
-  background-image: url(<%= asset_path "data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7" %>);
   background-position: left center;
   background-repeat: no-repeat;
 }
@@ -358,7 +358,7 @@
 }
 #jstree-dnd.jstree-default .jstree-ok,
 #jstree-dnd.jstree-default .jstree-er {
-  background-image: url(<%= asset_path "32px.png" %>);
+  background-image: url(<%= asset_path "fly_admin/32px.png" %>);
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -374,7 +374,7 @@
   background-position: -39px -71px;
 }
 .jstree-default > .jstree-striped {
-  background: url(<%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==" %>) left top repeat;
+  background: url(<%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==" %>) left top repeat;
 }
 .jstree-default > .jstree-wholerow-ul .jstree-hovered,
 .jstree-default > .jstree-wholerow-ul .jstree-clicked {
@@ -428,7 +428,7 @@
 }
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-  background-image: url(<%= asset_path "32px.png" %>);
+  background-image: url(<%= asset_path "fly_admin/32px.png" %>);
 }
 .jstree-default .jstree-node {
   background-position: -292px -4px;
@@ -490,7 +490,7 @@
   background-size: auto 48px;
 }
 .jstree-default.jstree-rtl .jstree-node {
-  background-image: url(<%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
   background-position: 100% 1px;
   background-repeat: repeat-y;
 }
@@ -522,16 +522,16 @@
   background-position: 0 0;
 }
 .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url(<%= asset_path "throbber.gif" %>) center center no-repeat;
+  background: url(<%= asset_path "fly_admin/throbber.gif" %>) center center no-repeat;
 }
 .jstree-default .jstree-file {
-  background: url(<%= asset_path "32px.png" %>) -100px -68px no-repeat;
+  background: url(<%= asset_path "fly_admin/32px.png" %>) -100px -68px no-repeat;
 }
 .jstree-default .jstree-folder {
-  background: url(<%= asset_path "32px.png" %>) -260px -4px no-repeat;
+  background: url(<%= asset_path "fly_admin/32px.png" %>) -260px -4px no-repeat;
 }
 .jstree-default.jstree-rtl .jstree-node {
-  background-image: url(<%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
 }
 .jstree-default.jstree-rtl .jstree-last {
   background: transparent;
@@ -564,7 +564,7 @@
 }
 .jstree-default-small .jstree-node,
 .jstree-default-small .jstree-icon {
-  background-image: url(<%= asset_path "32px.png" %>);
+  background-image: url(<%= asset_path "fly_admin/32px.png" %>);
 }
 .jstree-default-small .jstree-node {
   background-position: -295px -7px;
@@ -626,7 +626,7 @@
   background-size: auto 36px;
 }
 .jstree-default-small.jstree-rtl .jstree-node {
-  background-image: url(<%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
   background-position: 100% 1px;
   background-repeat: repeat-y;
 }
@@ -658,16 +658,16 @@
   background-position: 0 0;
 }
 .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url(<%= asset_path "throbber.gif" %>) center center no-repeat;
+  background: url(<%= asset_path "fly_admin/throbber.gif" %>) center center no-repeat;
 }
 .jstree-default-small .jstree-file {
-  background: url(<%= asset_path "32px.png" %>) -103px -71px no-repeat;
+  background: url(<%= asset_path "fly_admin/32px.png" %>) -103px -71px no-repeat;
 }
 .jstree-default-small .jstree-folder {
-  background: url(<%= asset_path "32px.png" %>) -263px -7px no-repeat;
+  background: url(<%= asset_path "fly_admin/32px.png" %>) -263px -7px no-repeat;
 }
 .jstree-default-small.jstree-rtl .jstree-node {
-  background-image: url(<%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==" %>);
 }
 .jstree-default-small.jstree-rtl .jstree-last {
   background: transparent;
@@ -700,7 +700,7 @@
 }
 .jstree-default-large .jstree-node,
 .jstree-default-large .jstree-icon {
-  background-image: url(<%= asset_path "32px.png" %>);
+  background-image: url(<%= asset_path "fly_admin/32px.png" %>);
 }
 .jstree-default-large .jstree-node {
   background-position: -288px 0px;
@@ -762,7 +762,7 @@
   background-size: auto 64px;
 }
 .jstree-default-large.jstree-rtl .jstree-node {
-  background-image: url(<%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
+  background-image: url(<%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==" %>);
   background-position: 100% 1px;
   background-repeat: repeat-y;
 }
@@ -794,16 +794,16 @@
   background-position: 0 0;
 }
 .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url(<%= asset_path "throbber.gif" %>) center center no-repeat;
+  background: url(<%= asset_path "fly_admin/throbber.gif" %>) center center no-repeat;
 }
 .jstree-default-large .jstree-file {
-  background: url(<%= asset_path "32px.png" %>) -96px -64px no-repeat;
+  background: url(<%= asset_path "fly_admin/32px.png" %>) -96px -64px no-repeat;
 }
 .jstree-default-large .jstree-folder {
-  background: url(<%= asset_path "32px.png" %>) -256px 0px no-repeat;
+  background: url(<%= asset_path "fly_admin/32px.png" %>) -256px 0px no-repeat;
 }
 .jstree-default-large.jstree-rtl .jstree-node {
-  background-image: url( <%= asset_path "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==" %>);
+  background-image: url( <%= asset_path "fly_admin/data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==" %>);
 }
 .jstree-default-large.jstree-rtl .jstree-last {
   background: transparent;
@@ -816,7 +816,7 @@
 		*/
   }
   .jstree-default-responsive .jstree-icon {
-    background-image: url(<%= asset_path "40px.png" %>);
+    background-image: url(<%= asset_path "fly_admin/40px.png" %>);
   }
   .jstree-default-responsive .jstree-node,
   .jstree-default-responsive .jstree-leaf > .jstree-ocl {
@@ -916,7 +916,7 @@
   .jstree-default-responsive .jstree-node > .jstree-ocl,
   .jstree-default-responsive .jstree-themeicon,
   .jstree-default-responsive .jstree-checkbox {
-    background-image: url(<%= asset_path "40px.png" %>);
+    background-image: url(<%= asset_path "fly_admin/40px.png" %>);
     background-size: 120px 200px;
   }
   .jstree-default-responsive .jstree-node {
@@ -938,11 +938,11 @@
     background-position: 0 0;
   }
   .jstree-default-responsive .jstree-file {
-    background: url(<%= asset_path "40px.png" %>) 0 -160px no-repeat;
+    background: url(<%= asset_path "fly_admin/40px.png" %>) 0 -160px no-repeat;
     background-size: 120px 200px;
   }
   .jstree-default-responsive .jstree-folder {
-    background: url(<%= asset_path "40px.png" %>) -40px -40px no-repeat;
+    background: url(<%= asset_path "fly_admin/40px.png" %>) -40px -40px no-repeat;
     background-size: 120px 200px;
   }
 }

data/app/controllers/fly_admin/footers_controller.rb

@@ -37,6 +37,7 @@ module FlyAdmin
     # PATCH/PUT /footers/1
     def update
       if @footer.update(footer_params)
+        @footer.local!
         clear_footer_cache
         redirect_to footers_url, notice: 'Тексты/Правилы были успешно изменены ⚒⚒⚒'
       else

data/app/controllers/fly_admin/subscriptions_controller.rb

@@ -0,0 +1,35 @@
+module FlyAdmin
+  class SubscriptionsController < ActionController::Base
+    def start
+      get_cookie
+      if @customer_key.present?
+        # video can be in multiple categories , so save category_id
+        session[:video] = JSON.generate({ :id => params[:video_id], :category_id => params[:category_id], :season_id => params[:season_id] })
+        link =  "http://#{@alias}/continue?key=#{@customer_key}"
+        redirect_to link
+      else
+        render nothing: true
+      end
+    end
+    
+    def splash  
+      begin
+        link = params[:back_url] + "?key=#{params[:customer_key]}"
+        redirect_to link
+      rescue Exception => e 
+        SUBSCRIPTION_LOG.error "#{e.message}\n\t#{e.backtrace}"
+        render nothing: true
+      end  
+    end
+
+    private
+
+    def get_cookie
+      if session[:alias]
+        @alias = session[:alias] 
+        @customer_key = session[:customer_key]
+      end
+    end  
+    
+  end
+end

data/app/models/fly_admin/footer.rb

@@ -4,5 +4,19 @@ module FlyAdmin
     validates_presence_of :paysite_id, :country_id
     belongs_to :paysite
     belongs_to :country
+    state_machine :source_type, initial: 'local' do
+      event :bornpay do
+        transition any => 'bornpay'
+      end
+      
+      event :imbs do
+        transition any => 'imbs'
+      end
+
+      # Если футер локальный, запросы к bornpay/imbs не делаем
+      event :local do
+        transition any => 'local'
+      end
+    end
   end
 end

data/app/views/fly_admin/categories/_form.html.haml

@@ -10,8 +10,51 @@
       / This area used as dropdown edit box
     / end widget edit box
     / widget content
-    .widget-body.no-padding
-      = nested_form_for(category, :html => {:class => 'smart-form'}) do |f|
+    = nested_form_for(category, :html => {:class => 'smart-form', :multipart => true}) do |f|
+      - if category.errors.any?
+        - category.errors.full_messages.each do |msg|
+          = render 'layouts/error_flash_message', msg: msg
+      %section
+        .row
+          - if category.poster
+            .col-xs-3
+              = link_to category.poster_url do
+                = image_tag category.poster_url, size: '245x305', class: 'margin-left-10'
+          .col-xs-8
+            %label.textarea
+              = f.text_area :description, placeholder: 'Описание сериала', class: 'form-control ckeditor'
+      .row
+        %section.col.col-8  
+          %label.input
+            = f.text_field :remote_poster_url, placeholder: 'Ссылка на постер', class: 'form-control input-sm margin-10'
+      %header
+        Дополнителная инфа
+      .row
+        %section.col.col-4
+          %label.input
+            = f.text_field :main_roles, placeholder: 'В главных ролях', class: 'margin-10 form-control input-sm' 
+        %section.col.col-4
+          %label.input
+            = f.text_field :country, placeholder: 'Страна', class: 'margin-10 form-control input-sm'     
+        %section.col.col-4
+          %label.input
+            = f.text_field :year, placeholder: 'Год', class: 'margin-10 form-control input-sm'
+      .row
+        %section.col.col-3
+          %lable.input
+            = f.text_field :scenario, placeholder: 'Сценарий', class: 'margin-10 form-control input-sm'
+        %section.col.col-3
+          %label.input
+            = f.text_field :director, placeholder: 'Режиссер', class: 'margin-10 form-control input-sm'  
+        %section.col.col-3
+          %label.input
+            = f.text_field :time, placeholder: 'Время', class: 'margin-10 form-control input-sm'
+        %section.col.col-3
+          %label.input
+            = f.text_field :genre, placeholder: 'Жанр', class: 'margin-10 form-control input-sm'
+      %br
+      .widget-body.no-padding
+        %header Инфа о сезонах
         %table.table.table-bordered.margin-10.table-serials{style: 'width: 500px;'}
           %thead
             %tr
@@ -33,34 +76,40 @@
                     = text_field_tag "name[#{locale}]", nil, class: 'input-xs', style: 'width: 90%;'
                 %td
                   = locale
-
         = link_to "Остальные языки для сериалов", "#", id: 'show-categories-inputs', class: 'margin-10 btn btn-for-link btn-link'
         = f.link_to_add 'Добавить сезон', :seasons, class: 'margin-10 btn btn-for-link btn-primary'
         = f.fields_for :seasons do |season_form|
           = season_form.hidden_field :id
-          %table.table.table-bordered.margin-10{style: 'width: 500px;'}
-            %thead
-              %tr
-                %th Название сезона
-                %th на языке
-              %tbody
-                - categories_with_locales.each_with_index do |arr, index|
-                  - locale = arr[0]
-                  - title = arr[1] 
+          .row
+            .col-xs-6
+              %table.table.table-bordered.margin-10{style: 'width: 500px;'}
+                %thead
+                  %tr
+                    %th Название сезона
+                    %th на языке
+                  %tbody
+                    - categories_with_locales.each_with_index do |arr, index|
+                      - locale = arr[0]
+                      - title = arr[1] 
 
-                  - if index >= 2  
-                    - hide_class = "hidden-seasons-inputs"
+                      - if index >= 2  
+                        - hide_class = "hidden-seasons-inputs"
 
-                  %tr{class: hide_class}
-                    %td
-                      - if season_form.object.persisted?
-                        = text_field_tag "#{season_form.object_name}[title][#{locale}]]", season_form.object.name_with_locale(locale), class: 'input-xs', style: 'width: 90%;'
-                      - else
-                        = text_field_tag "#{season_form.object_name}[title][#{locale}]]", nil, class: 'input-xs', style: 'width: 90%;'
-                    %td  
-                      = locale      
-          = link_to "Остальные языки для сезонов", "#", class: 'show-seasons-inputs margin-10 btn btn-for-link btn-link'
-          = season_form.link_to_remove 'Удалить сезон', class: 'margin-10 btn btn-for-link btn-danger'
-                  
+                      %tr{class: hide_class}
+                        %td
+                          - if season_form.object.persisted?
+                            = text_field_tag "#{season_form.object_name}[title][#{locale}]]", season_form.object.name_with_locale(locale), class: 'input-xs', style: 'width: 90%;'
+                          - else
+                            = text_field_tag "#{season_form.object_name}[title][#{locale}]]", nil, class: 'input-xs', style: 'width: 90%;'
+                        %td  
+                          = locale      
+              = link_to "Остальные языки для сезонов", "#", class: 'show-seasons-inputs margin-10 btn btn-for-link btn-link'
+              = season_form.link_to_remove 'Удалить сезон', class: 'margin-10 btn btn-for-link btn-danger'
+            .col-xs-4
+              %label.textarea
+                = season_form.text_field :remote_poster_url, placeholder: 'Ссылка на постер', class: 'form-control input-sm margin-10'      
+              - if season_form.object.persisted?
+                = link_to season_form.object.poster_url do
+                  = image_tag season_form.object.poster_url, size: '100x100', class: 'margin-left-10'                  
         %footer
-          = f.submit 'Сохранить', class: 'btn btn-primary'   
+          = f.submit 'Сохранить', class: 'btn btn-primary'   

data/app/views/fly_admin/footers/_form.html.haml

@@ -1,3 +1,9 @@
+- if @footer.persisted? && @footer.source_type != 'local'
+  .alert.alert-danger.fade.in
+    %button.close{"data-dismiss" => "alert"}
+      x
+    %i.fa-fw.fa.fa-info
+    = "Внимание! Данный футер был получен из #{@footer.source_type} Поэтому, изменив его, он станет локальным и обновляться не будет!"
 #wid-id-8.jarviswidget{"data-widget-custombutton" => "false", "data-widget-editbutton" => "false", :id => "wid-id-0", 'data-widget-colorbutton' => true}
   %header
     %span.widget-icon
@@ -48,4 +54,4 @@
               %label.select
                 = f.select :country_id, FlyAdmin::Country.all.collect { |c| [c.name,c.id] }, {}, {class: 'input-sm'}
         %footer
-          = f.submit 'Сохранить', class: 'btn btn-primary'   
+          = f.submit 'Сохранить', class: 'btn btn-primary'   

data/app/views/fly_admin/footers/index.html.haml

@@ -31,6 +31,8 @@
                 Страна
               %th
                 Траффик
+              %th
+                Источник
               %th
                 Опции 
           %tbody
@@ -50,6 +52,8 @@
                   = footer.country.try(:name) 
                 %td
                   = footer.paysite.try(:name)
+                %td
+                  = footer.source_type
                 %td  
                   = link_to edit_footer_path(footer) do
                     %i.fa.fa-edit.fa-2x

data/app/views/layouts/fly_admin/_flash_messages.html.haml

@@ -15,12 +15,7 @@
         %strong К сведению: 
         = msg
     - when "error"
-      .alert.alert-danger.fade.in
-        %button.close{"data-dismiss" => "alert"}
-          ×
-        %i.fa-fw.fa.fa-times
-        %strong Ошибка: 
-        = msg
+      = render 'layouts/error_flash_message', msg: msg
     - else
       .alert.alert-info.fade.in
         %button.close{"data-dismiss" => "alert"}

data/db/migrate/20150428102104_add_source_type_to_fly_admin_footers.rb

@@ -0,0 +1,5 @@
+class AddSourceTypeToFlyAdminFooters < ActiveRecord::Migration
+  def change
+    add_column :fly_admin_footers, :source_type, :string, default: "local"
+  end
+end

data/lib/fly_admin/connection_api.rb

@@ -0,0 +1,66 @@
+module FlyAdmin
+  class ConnectionApi
+
+    def self.check_user(user)
+      valid = true
+      begin
+        api_url = SiteConfig['wap_click_addr'] + "/api/check"
+        api_url = 'http://0.0.0.0:3000/api/check' if Rails.env.eql? 'development'
+        request = RestClient.get(api_url, :params => {:pass => user.customer_key})
+        hash = JSON.parse request
+        hash = hash.with_indifferent_access
+        VALIDATION_LOG.info "status for user #{user.id}: #{hash.inspect}"
+        valid = false unless hash[:status].eql? true
+      rescue Exception => e
+        VALIDATION_LOG.error "error check status for user #{user.id}: #{e.message}"
+      end
+      valid
+    end
+
+    def self.get_customer_params(params, request)
+     if ENV["RAILS_ENV"] == 'test' || ENV['TEST'].present? || Rails.env.eql?('test')
+        { key: 'fun_key', alias: 'imbs_domain.com', action_type: 'wap', 'status' => 'ok', country: 'az'}
+      else
+        url = SiteConfig['wap_click_addr'] + '/api/handle_customer'
+        # if Rails.env.eql? 'development'
+        #   url = 'http://0.0.0.0:3000' + '/api/handle_customer'
+        #   request.env['REMOTE_ADDR'] = '83.149.34.187'
+        # end
+        request_params = self.make_customer_request_params(request, params)
+        if ENV['TEST']
+          request_params[:remote_addr] = '83.149.9.19'
+        end
+        API_LOG.info "HTTP_USER_AGENT: #{request.env['HTTP_USER_AGENT']}"
+        API_LOG.info "URL TO IMBS: #{url}?#{request_params.to_query}"
+        begin
+          response = RestClient.get(url, :params => request_params)
+          API_LOG.info "RESPONSE FROM IMBS: #{response.inspect}"
+          out_hash = JSON.parse(response)
+          out_hash.with_indifferent_access
+        rescue Exception => e
+          API_LOG.error "response: #{response.inspect}"
+          {status: 'error'}
+        end
+      end
+      # end
+    end
+
+    def self.make_customer_request_params(request, params)
+      p = {}
+      p[:customer_key] = params[:key]
+      p[:sid]         = params[:sid]
+      if p[:customer_key].blank?
+        p[:remote_addr] = request.env['REMOTE_ADDR']
+        p[:x_forwarded_for] = request.env['HTTP_X_FORWARDED_FOR']
+      end
+      p[:service_code] = SiteConfig['wc_service_code']
+
+      p = p.delete_if { |k,v| v.blank? }
+
+      concat =  p[:customer_key].to_s + p[:sid].to_s + p[:remote_addr].to_s + p[:x_forwarded_for].to_s + p[:service_code].to_s + SiteConfig['wc_service_salt'].to_s
+      p[:hash] = Digest::MD5.hexdigest(concat)
+      p
+    end
+
+  end
+end

data/lib/fly_admin/page_cache.rb

@@ -8,14 +8,18 @@ module FlyAdmin
     def initialize
       @rails_cache = ActiveSupport::Cache::MemoryStore.new
     end
-    # footer_ru_wap
-    # page_en_mt
+    # Get footers like this
+    # footer_wap_ru
+    # Get pages (unsubscribe etc) like this
+    # page_mt_en
     def read(elem)
       text = @rails_cache.read(elem)
       expired_in = @rails_cache.read("#{elem}_expired_an")
 
       unless text
         text = check_footer(elem)
+        # Write to Rails cache like
+        # elem = content_wap_ru
         write_with_date(elem, text)
       else
         if Time.now > expired_in
@@ -47,7 +51,6 @@ module FlyAdmin
       @rails_cache.clear
     end
 
-
     def check_footer(elem)
       name, paysite, country = elem.split '_'
 
@@ -55,9 +58,29 @@ module FlyAdmin
         .joins(:country, :paysite)
         .where('fly_admin_countries.name = ? and fly_admin_paysites.name = ?', country, paysite).first
       # get footer from db , else get it content from url like this www.bornpay.com/footer/hsSDAasd.wap.ru.html
-      # disable bornpay, use imbs in future
-      footer ? footer.send(name) : ""
-      #http_load(name, paysite, country)
+      FlyAdmin.api_type == 'bornpay' ? get_footer_from_bornpay(footer, name, paysite, country) : get_footer_from_imbs(footer, name, paysite, country)
+    end
+    def get_footer_from_bornpay(footer, name, paysite, country)
+      if footer && footer.local? 
+        # Get from db
+        footer.send(name)
+      else 
+        # Load from bornpay
+        footer_from_request = http_load(name, paysite, country)
+        # Save bornpay footer to db
+        save_footer_to_db(footer_from_request, name, paysite, country)
+        return footer_from_request
+      end
+    end
+
+    def get_footer_from_imbs(footer, name, paysite, country)
+      if footer
+        # Get from db
+        footer.send(name)
+      else
+        # Empty footer 
+        ""
+      end
     end
 
     def http_load(name, paysite, country)
@@ -74,5 +97,28 @@ module FlyAdmin
         ""
       end
     end
+
+    def save_footer_to_db(footer_text, name, paysite, country)
+      if footer_text.present?
+        API_LOG.info "footer :#{footer_text}, name: #{name}, paysite: #{paysite}, country: #{country}"
+        country = Country.find_by_name(country)
+        paysite = Paysite.find_by_name(paysite)
+        case name
+        when 'content'
+          attributes = { 'content' => footer_text}
+        when 'unsubscription'
+          attributes = { 'unsubscription' => footer_text }
+        when 'offer'
+          attributes = { 'offer' => footer_text }
+        when 'terms' 
+          attributes = { 'terms' => footer_text }
+        end
+        attributes.merge!('source_type' => FlyAdmin.api_type)
+        footer = FlyAdmin::Footer.find_or_create_by(country: country, paysite: paysite)  
+        footer.assign_attributes(attributes)
+        footer.source_type = FlyAdmin.api_type
+        footer.save!
+      end
+    end
   end
 end

data/lib/fly_admin/version.rb

@@ -1,3 +1,3 @@
 module FlyAdmin
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/fly_admin.rb

@@ -1,5 +1,6 @@
 require "fly_admin/engine"
 require "fly_admin/page_cache"
+require "fly_admin/connection_api"
 require "awesome_print"
 module FlyAdmin
   # See fly_admin_initializer.rb for more description

data/lib/generators/fly_admin/install/install_generator.rb

@@ -55,6 +55,33 @@ module FlyAdmin
       end
     end
 
+    def replace_state_machine_with_state_machines
+      gemfile_path = "#{Rails.root}/Gemfile"
+      gemfile = File.read(gemfile_path)
+      new_contents = gemfile.gsub(/gem "state_machine", :git => '.*'/, "gem 'state_machines-activerecord'")
+      new_contents.gsub!(/# using git.*295/, "")
+      File.open(gemfile_path, 'w') {|f| f.write(new_contents) }  
+      ap "Running bundle install", :color => { :string => :green }
+      `bundle install`
+    end
+
+    def replace_connection_api
+      remove_file('lib/connection_api.rb')
+      controller_path = "#{Rails.root}/app/controllers/application_controller.rb"
+      controller_contents = File.read(controller_path)
+      controller_contents.gsub!(/ ConnectionApi/, " FlyAdmin::ConnectionApi")
+      File.open(controller_path, 'w') { |f| f.write(controller_contents) }
+    end
+
+    def replace_subscription_controller
+      remove_file('app/controllers/subscriptions_controller.rb')
+      routes_path = "#{Rails.root}/config/routes.rb"
+      routes_contents = File.read(routes_path)
+      routes_contents.gsub!(/"subscriptions#start"/,'"fly_admin/subscriptions#start"')
+      routes_contents.gsub!(/"subscriptions#splash"/, '"fly_admin/subscriptions#splash"')
+      File.open(routes_path, 'w') { |f| f.write(routes_contents) }
+    end
+
     private
     def engine_not_mounted?
       File.open("#{Rails.root}/config/routes.rb").each_line do |line|

data/lib/tasks/fly_admin_tasks.rake

@@ -27,7 +27,13 @@ namespace :fly_admin do
     desc 'Migrate existing footers'
     task :footers => :environment do
       Footer.all.each do |old_footer|
-        attributes = old_footer.attributes.merge({"id" => nil, "created_at" => nil, "updated_at" => nil})
+        paysite_name = old_footer.paysite.name
+        country_name = old_footer.country.name
+
+        country_id = FlyAdmin::Country.find_by_name(country_name).id
+        paysite_id = FlyAdmin::Paysite.find_by_name(paysite_name).id
+
+        attributes = old_footer.attributes.merge({"id" => nil, "created_at" => nil, "updated_at" => nil, "source_type" => "local", "paysite_id" => paysite_id, "country_id" => country_id})
         FlyAdmin::Footer.create!(attributes)
       end
       ap "Migrating is successfull!", :color => { :string => :green }

data/test/dummy/config/initializers/assets.rb

@@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( .eot .svg .ttf .woff )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ruslan Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +104,8 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/images/fly_admin/32px.png
+- app/assets/images/fly_admin/40px.png
 - app/assets/images/fly_admin/ajax-loader.gif
 - app/assets/images/fly_admin/alpha.png
 - app/assets/images/fly_admin/avatars/1.png
@@ -903,6 +919,7 @@ files:
 - app/controllers/fly_admin/categories_controller.rb
 - app/controllers/fly_admin/footers_controller.rb
 - app/controllers/fly_admin/settings_controller.rb
+- app/controllers/fly_admin/subscriptions_controller.rb
 - app/controllers/fly_admin/uploads_controller.rb
 - app/controllers/fly_admin/videos_controller.rb
 - app/helpers/fly_admin/application_helper.rb
@@ -946,7 +963,9 @@ files:
 - db/migrate/20150417075759_create_fly_admin_footers.rb
 - db/migrate/20150417142656_create_fly_admin_paysites.rb
 - db/migrate/20150417142744_create_fly_admin_countries.rb
+- db/migrate/20150428102104_add_source_type_to_fly_admin_footers.rb
 - lib/fly_admin.rb
+- lib/fly_admin/connection_api.rb
 - lib/fly_admin/engine.rb
 - lib/fly_admin/page_cache.rb
 - lib/fly_admin/railtie.rb