ish_manager 0.1.8.148 → 0.1.8.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5362b2284f03e9698acaef7778497a74736023c8
-  data.tar.gz: 45dff6f81e282bf57807fe3ec5efb7536011a86c
+  metadata.gz: 927eebb21498c49dfb7d3ef57c107a357363d0d0
+  data.tar.gz: 47a8cca163768504c9d649e0fcc26f9ef6152411
 SHA512:
-  metadata.gz: 8e67b029f3bec25556cc8ef6e528c5696988e92378c0d8145aff92d42429b43eed8b5277e306a330f1e977935901a9fe20b253c79499c274157d55ccf5a6f60b
-  data.tar.gz: 49ebf0583d5a33a3dcee96958c044993793e281b42ce48710b2a1e23e6e01b05c6a0fab4f8b9bfc18b27a4ece8225185eff5670c4d294f7948b887dbff7815d4
+  metadata.gz: ff7a992689e15db9cc9f623933362b1948e324ea304d3f91133b2595d245b895d2c942c42bc142a1d3589ed4cd7ecd600e446c8e99243eb1100bc4aaaf92a536
+  data.tar.gz: b19f8fa2ab61fa0717eba4fa9fbb1439c60a9cc697f3b8e5ef6478dc1f4cc71840f74941c9bd82fab20debebba0985e24a0f4fc5963b883cc157aac7520f3598

data/app/controllers/ish_manager/galleries_controller.rb

@@ -6,7 +6,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     authorize! :index, Gallery
     @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
                                        ).order_by( :created_at => :desc 
-                                                 ).page( params[:galleries_page] ).per( 10 )
+                                                 ) # .page( params[:galleries_page] ).per( 10 )
     if params[:q]
       @galleries = @galleries.where({ :name => /#{params[:q]}/i })      
     end
@@ -14,21 +14,20 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     @shared_galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false ).page( params[:shared_galleries_page] ).per( 10 )
   end
 
-  ## same as index
-  # def index_title 
-  # end
-
+=begin
+  def index_title
+  end
   def index_thumb
     @galleries = Gallery.unscoped.where( :is_trash => false 
                                        ).order_by( :created_at => :desc 
                                                  ).page( params[:galleries_page] ).per( 10 )
   end
-
   def index_mini
     @galleries = Gallery.unscoped.where( :is_trash => false 
                                        ).order_by( :created_at => :desc 
                                                  ).page( params[:galleries_page] ).per( 10 )
   end
+=end
 
   def new
     @gallery = Gallery.new

data/app/controllers/ish_manager/invoices_controller.rb

@@ -5,7 +5,7 @@ class IshManager::InvoicesController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::Invoice
-    @invoices = Ish::Invoice.all
+    @invoices = Ish::Invoice.all.includes( :payments )
   end
 
   def new

data/app/controllers/ish_manager/payments_controller.rb

@@ -0,0 +1,9 @@
+
+class IshManager::PaymentsController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::Payment
+    @payments = Ish::Payment.all.includes( :invoice )
+  end
+
+end

data/app/views/ish_manager/galleries/index.haml

@@ -7,20 +7,22 @@
 
 = render 'ish_manager/sites/header', :site => @site if @site
 
-.container
+.title
   .row
-    .col-sm-6
-      %h4
-        My Galleries (#{@galleries.count})
-        = link_to '[+]', new_gallery_path
-    .col-sm-6= render 'search'
-  .row
-    .col-sm-12
-      -# = render 'ish_manager/galleries/menu_secondary'
-      = render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page
-      
-.container
-  .row
-    .col-sm-12
-      %h4 Shared with me
-      = render 'ish_manager/galleries/list', :galleries => @shared_galleries, :param_name => :shared_galleries_page
+    .col-sm-12.col-md-12
+      %h1.center Galleries
+      %ul
+        %li= link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
+        %li= link_to 'thumbs list', galleries_index_thumbs_path( :render_type => Gallery::RENDER_TITLES )
+
+.row
+  .col-sm-12.col-md-6
+    %h4 My Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
+    = render 'search'
+    - if params[:render_type] == Gallery::RENDER_TITLES
+      = render 'ish_manager/galleries/index_title', :galleries => @galleries, :param_name => :galleries_page
+    - else
+      = render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page    
+  .col-sm-12.col-md-6
+    %h4 Shared with me
+    = render 'ish_manager/galleries/list', :galleries => @shared_galleries, :param_name => :shared_galleries_page

data/app/views/ish_manager/invoices/_form.haml

@@ -2,20 +2,19 @@
 - url = invoice.persisted? ? invoice_path( invoice.id ) : invoices_path
 
 = form_for invoice, :as => :invoice, :url => url do |f|
-  -# .input-field
-    %label email
-    = text_field_tag :email
-  .a
-    %label profile
-    = f.select :profile, options_for_select( IshModels::UserProfile.all.map{ |p| [ p.email, p.id ] } )
-    
-  %label amount
-  = f.number_field :amount, :step => 0.01, :default => 0.0
+  .input-field
+    %label Email
+    = f.text_field :email
 
-  %label number
-  = f.number_field :number
+  .input-field
+    %label amount
+    = f.number_field :amount, :step => 0.01, :default => 0.0
 
-  .a
+  .input-field
+    %label number
+    = f.number_field :number
+
+  .input-field
     %label Description
     = f.text_area :description
   

data/app/views/ish_manager/invoices/index.haml

@@ -1,4 +1,8 @@
 
+-#
+-# invoices / index.haml
+-#
+
 %h3
   Invoices
   = link_to '[+]', new_invoice_path
@@ -8,12 +12,19 @@
     = render 'form', :invoice => @new_invoice
 %hr
 
-%ul
-  - @invoices.each do |i|
-    %li
-      .panel
-        .panel-content
-          .a Number: #{i.number}
-          .a Email: #{i.profile.email}
-          .a Amount: #{i.amount}
-          .a Payments: #{i.payments.map { |p| p.amount }.join(", ") }
+%table#dataTable
+  %thead
+    %tr
+      %th Email
+      %th Number
+      %th Amount
+      %th Amount Paid
+      %th Created At
+  %tbody
+    - @invoices.each do |i|
+      %tr
+        %td= i.email
+        %td= i.number
+        %td= i.amount
+        %td= i.paid_amount
+        %td= i.created_at.to_s[0..10]

data/app/views/ish_manager/payments/index.haml

@@ -0,0 +1,21 @@
+
+-#
+-# payments / index.haml
+-#
+
+%h1 Payments
+
+%table#dataTable
+  %thead
+    %tr
+      %th Amount
+      %th Charge
+      %th Invoice
+      %th Created At
+  %tbody
+    - @payments.each do |p|
+      %tr
+        %td= p.amount
+        %td #{p.charge.to_s.length} characters
+        %td #{p.invoice.email} :: #{p.invoice.number}
+        %td= p.created_at.to_s[0..10]

data/config/routes.rb

@@ -21,12 +21,14 @@ IshManager::Engine.routes.draw do
   resources :feature
   resources :friends
 
+  get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
+  get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end
 
   resources :invoices do
-    resources :payments
+    # resources :payments
   end
 
   get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.148
+  version: 0.1.8.149
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
 - app/controllers/ish_manager/orders_controller.rb
+- app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
@@ -235,11 +236,9 @@ files:
 - app/views/ish_manager/galleries/edit.haml
 - app/views/ish_manager/galleries/index.haml
 - app/views/ish_manager/galleries/index_ajax.haml
-- app/views/ish_manager/galleries/index_mini.haml
 - app/views/ish_manager/galleries/index_short.haml
 - app/views/ish_manager/galleries/index_thumb.haml
 - app/views/ish_manager/galleries/index_title.haml
-- app/views/ish_manager/galleries/index_trash.haml
 - app/views/ish_manager/galleries/new.haml
 - app/views/ish_manager/galleries/show.haml
 - app/views/ish_manager/invoices/_form.haml
@@ -263,6 +262,7 @@ files:
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
 - app/views/ish_manager/orders/index.haml
+- app/views/ish_manager/payments/index.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_multinew.haml
 - app/views/ish_manager/photos/show.haml

data/app/views/ish_manager/galleries/index_trash.haml

@@ -1,20 +0,0 @@
-
-%ol.galleries-index
-  - @galleries.each do |g|
-    %li
-      = link_to '[~]', edit_manager_gallery_path( g )
-      = link_to g.name, manager_gallery_path( g.galleryname )
-      = link_to '[+]', new_photo_path( :galleryname => g.galleryname )
-      = link_to '[++]', add_photos_path( g.id )
-      .delete= button_to '[x]', manager_gallery_path( g.galleryname ), :method => :delete
-      .site= g.site.domain unless g.site.blank?
-      .tag= g.tag.name unless g.tag.blank?
-        
-      %br
-      - g.photos.fresh.each_with_index do |ph, idx|
-        - break if idx == Photo.n_per_manager_gallery - 1
-        = link_to image_tag( ph.photo.url( :mini ), :alt => '' ), ph.photo.url(:large), :rel => "lightbox[#{g.galleryname}]"
-
-.c
-- unless params[:fullindex]
-  = paginate @galleries, :param_name => :galleries_page