vyapari 0.1.5dev10 → 0.1.5

data/app/views/vyapari/admin/{categories → users}/index.html.erb

@@ -1,22 +1,37 @@
 <div class="row">
       
   <div class="col-md-12">
-    
     <ul class="nav nav-tabs">
+
+      <%# Show Admin tab only for admins %>
+      <% if @current_user.is_super_admin? %>
+        <li class="<%= @super_admin == false ? 'active' : '' %>">
+          <%= link_to "Users", admin_users_path(sa: '0') %>
+        </li>
+        <li class="<%= @super_admin == true ? 'active' : '' %>">
+          <%= link_to "Administrators", admin_users_path(sa: '1') %>
+        </li>
+      <% else %>
+        <li class="active">
+          <%= link_to "Users", admin_users_path(sa: '0') %>
+        </li>
+      <% end %>
+
     </ul>
+
     <div class="tab-content">
       <div class="tab-pane active">
 
-        <div id="div_category_action_buttons">
+        <div id="div_user_action_buttons">
           <div class="row">
             <div class="col-md-6">
               
-              <%= theme_button('Add a Category', 'plus', new_admin_category_path(), classes: "pull-left", btn_type: "success") %>
+              <%= theme_button('Add a User', 'plus', new_admin_user_path(), classes: "pull-left", btn_type: "success") %>
 
-              <%= theme_button('Refresh', 'refresh', admin_categories_path(), classes: "pull-left ml-10", btn_type: "white") %>
+              <%= theme_button('Refresh', 'refresh', admin_users_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
               <!-- Single button -->
-              <div class="ml-10 btn-group hidden">
+              <div class="ml-10 btn-group">
                 <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   More Actions <span class="caret"></span>
                 </button>
@@ -27,16 +42,17 @@
                   <li><a href="#">Export Users</a></li>
                 </ul>
               </div>
+
             </div>
             <div class="col-md-6">
-              <%= search_form_kuppayam(Category, admin_categories_path, text: @filters[:query]) %>
+              <%= search_form_kuppayam(User, admin_users_path, text: @filters[:query]) %>
             </div>
           </div>
         </div>
         <%= clear_tag(10) %>
 
-        <div id="div_category_index">
-          <%= render :partial=>"vyapari/admin/categories/index" %>
+        <div id="div_user_index">
+          <%= render :partial=>"usman/admin/users/index" %>
         </div>
         <%= clear_tag(10) %>
 

data/config/routes.rb

@@ -1,5 +1,7 @@
 Vyapari::Engine.routes.draw do
 
+  mount Usman::Engine => "/"
+
   namespace :admin do
 
     get   '/dashboard',         to: "dashboard#index",  as:   :dashboard
@@ -11,79 +13,16 @@ Vyapari::Engine.routes.draw do
 
     # Stock Management Routes
     resources :suppliers
-    resources :stores do
-
-      member do
-        put :update_status, as:  :update_status
-      end
-      
-      resources :terminals do
-        member do
-          put :update_status, as:  :update_status
-        end
-      end
-    end
+    resources :stores
+    resources :brands
     
-    resources :brands do
-      member do
-        put :update_status, as:  :update_status
-        put :mark_as_featured, as:  :mark_as_featured
-        put :remove_from_featured, as:  :remove_from_featured
-      end
-    end
-
     resources :categories do
       member do
         put :update_status, as:  :update_status
-        put :mark_as_featured, as:  :mark_as_featured
-        put :remove_from_featured, as:  :remove_from_featured
-        put :make_parent, as:  :make_parent
-      end
-    end
-
-    resources :products do
-      member do
-        put :update_status, as:  :update_status
-        put :mark_as_featured, as:  :mark_as_featured
-        put :remove_from_featured, as:  :remove_from_featured
       end
     end
 
-  end
-
-  get '/users/dashboard', to: "user_dashboard#index",  as: :user_dashboard
-
-  namespace :store_manager do
-
-    scope '/:store_id' do
-      get '/dashboard', to: "dashboard#index",  as: :dashboard
-      get '/reports/sales', to: "reports/sales#index", as: :sales_report
-      get '/reports/invoices', to: "reports/invoices#index", as: :invoices_report
-      get '/reports/stock', to: "reports/stock#index", as: :stock_report
-      resources :terminals
-      resources :stock_entries
-      resources :stock_bundles do
-        member do
-          get :download_original_file, as:  :download_original_file
-          get :download_error_file, as:  :download_error_file
-        end
-      end
-    end
+   end
 
-  end
-
-  namespace :terminal_staff do
-    
-    scope '/:terminal_id' do
-      get   '/dashboard',         to: "dashboard#index",  as:   :dashboard
-      get   '/search',            to: "dashboard#search",  as:  :dashboard_search
-      resources :invoices do
-        resources :line_items
-      end
-    end
-
-  end
-
-  mount Usman::Engine => "/"
 
 end

data/db/migrate/20170000000200_create_exchange_rates.rb

@@ -2,8 +2,7 @@ class CreateExchangeRates < ActiveRecord::Migration
   def change
     create_table(:exchange_rates) do |t|
 
-      t.string :base_currency, limit: 4
-      t.string :counter_currency, limit: 4
+      t.string :currency_name, limit: 4
       t.decimal :value, :precision => 16, :scale => 4
       t.datetime :effective_date
 
@@ -11,7 +10,7 @@ class CreateExchangeRates < ActiveRecord::Migration
     end
 
     add_reference :exchange_rates, :country
-    add_index :exchange_rates, [:base_currency, :counter_currency]
+    add_index :exchange_rates, [:currency_name, :country_id]
     
   end
 end

data/lib/tasks/vyapari_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :vyapari do
+#   # Task goes here
+# end

data/lib/vyapari/version.rb

@@ -1,3 +1,3 @@
 module Vyapari
-  VERSION = '0.1.5dev10'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vyapari
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev10
+  version: 0.1.5
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,48 +84,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: axlsx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: kuppayam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: usman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -334,78 +320,28 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/vyapari_manifest.js
-- app/assets/images/vyapari/sample_stock_bundle.csv
 - app/controllers/vyapari/admin/base_controller.rb
-- app/controllers/vyapari/admin/brands_controller.rb
-- app/controllers/vyapari/admin/categories_controller.rb
 - app/controllers/vyapari/admin/countries_controller.rb
 - app/controllers/vyapari/admin/dashboard_controller.rb
 - app/controllers/vyapari/admin/exchange_rates_controller.rb
-- app/controllers/vyapari/admin/products_controller.rb
 - app/controllers/vyapari/admin/regions_controller.rb
 - app/controllers/vyapari/admin/resource_controller.rb
-- app/controllers/vyapari/admin/stores_controller.rb
-- app/controllers/vyapari/admin/suppliers_controller.rb
-- app/controllers/vyapari/admin/terminals_controller.rb
+- app/controllers/vyapari/admin/users_controller.rb
 - app/controllers/vyapari/application_controller.rb
-- app/controllers/vyapari/store_manager/base_controller.rb
-- app/controllers/vyapari/store_manager/dashboard_controller.rb
-- app/controllers/vyapari/store_manager/reports/invoices_controller.rb
-- app/controllers/vyapari/store_manager/reports/sales_controller.rb
-- app/controllers/vyapari/store_manager/reports/stock_controller.rb
-- app/controllers/vyapari/store_manager/resource_controller.rb
-- app/controllers/vyapari/store_manager/stock_bundles_controller.rb
-- app/controllers/vyapari/store_manager/stock_entries_controller.rb
-- app/controllers/vyapari/terminal_staff/base_controller.rb
-- app/controllers/vyapari/terminal_staff/dashboard_controller.rb
-- app/controllers/vyapari/terminal_staff/invoices_controller.rb
-- app/controllers/vyapari/terminal_staff/line_items_controller.rb
-- app/controllers/vyapari/terminal_staff/resource_controller.rb
-- app/controllers/vyapari/user_dashboard_controller.rb
 - app/helpers/vyapari/application_helper.rb
 - app/jobs/vyapari/application_job.rb
 - app/mailers/vyapari/application_mailer.rb
-- app/models/bank_account.rb
 - app/models/brand.rb
 - app/models/category.rb
-- app/models/contact.rb
 - app/models/country.rb
 - app/models/exchange_rate.rb
-- app/models/image/brand_image.rb
-- app/models/image/category_image.rb
-- app/models/image/product_image.rb
-- app/models/invoice.rb
-- app/models/line_item.rb
 - app/models/product.rb
 - app/models/region.rb
-- app/models/stock_bundle.rb
-- app/models/stock_entry.rb
-- app/models/store.rb
-- app/models/supplier.rb
-- app/models/terminal.rb
 - app/models/vyapari/application_record.rb
-- app/uploaders/brand_image_uploader.rb
-- app/uploaders/category_image_uploader.rb
-- app/uploaders/product_image_uploader.rb
-- app/uploaders/stock_bundle_uploader.rb
 - app/views/layouts/kuppayam/_footer.html.erb
 - app/views/layouts/kuppayam/_header.html.erb
 - app/views/layouts/kuppayam/_navbar.html.erb
 - app/views/layouts/kuppayam/_sidebar.html.erb
-- app/views/layouts/vyapari/_store_manager_menu.html.erb
-- app/views/layouts/vyapari/_terminal_staff_menu.html.erb
-- app/views/layouts/vyapari/store_manager.html.erb
-- app/views/layouts/vyapari/terminal_staff.html.erb
-- app/views/vyapari/admin/brands/_form.html.erb
-- app/views/vyapari/admin/brands/_index.html.erb
-- app/views/vyapari/admin/brands/_row.html.erb
-- app/views/vyapari/admin/brands/_show.html.erb
-- app/views/vyapari/admin/brands/index.html.erb
-- app/views/vyapari/admin/categories/_form.html.erb
-- app/views/vyapari/admin/categories/_index.html.erb
-- app/views/vyapari/admin/categories/_row.html.erb
-- app/views/vyapari/admin/categories/_show.html.erb
-- app/views/vyapari/admin/categories/index.html.erb
 - app/views/vyapari/admin/countries/_form.html.erb
 - app/views/vyapari/admin/countries/_index.html.erb
 - app/views/vyapari/admin/countries/_row.html.erb
@@ -417,109 +353,21 @@ files:
 - app/views/vyapari/admin/exchange_rates/_row.html.erb
 - app/views/vyapari/admin/exchange_rates/_show.html.erb
 - app/views/vyapari/admin/exchange_rates/index.html.erb
-- app/views/vyapari/admin/products/_form.html.erb
-- app/views/vyapari/admin/products/_index.html.erb
-- app/views/vyapari/admin/products/_row.html.erb
-- app/views/vyapari/admin/products/_show.html.erb
-- app/views/vyapari/admin/products/index.html.erb
 - app/views/vyapari/admin/regions/_form.html.erb
 - app/views/vyapari/admin/regions/_index.html.erb
 - app/views/vyapari/admin/regions/_row.html.erb
 - app/views/vyapari/admin/regions/_show.html.erb
 - app/views/vyapari/admin/regions/index.html.erb
-- app/views/vyapari/admin/stores/_form.html.erb
-- app/views/vyapari/admin/stores/_index.html.erb
-- app/views/vyapari/admin/stores/_row.html.erb
-- app/views/vyapari/admin/stores/_show.html.erb
-- app/views/vyapari/admin/stores/index.html.erb
-- app/views/vyapari/admin/suppliers/_form.html.erb
-- app/views/vyapari/admin/suppliers/_index.html.erb
-- app/views/vyapari/admin/suppliers/_row.html.erb
-- app/views/vyapari/admin/suppliers/_show.html.erb
-- app/views/vyapari/admin/suppliers/index.html.erb
-- app/views/vyapari/admin/terminals/_form.html.erb
-- app/views/vyapari/admin/terminals/_index.html.erb
-- app/views/vyapari/admin/terminals/_row.html.erb
-- app/views/vyapari/admin/terminals/_show.html.erb
-- app/views/vyapari/store_manager/dashboard/_sales_counts.html.erb
-- app/views/vyapari/store_manager/dashboard/_stock_counts.html.erb
-- app/views/vyapari/store_manager/dashboard/_terminals.html.erb
-- app/views/vyapari/store_manager/dashboard/index.html.erb
-- app/views/vyapari/store_manager/reports/invoices/_index.html.erb
-- app/views/vyapari/store_manager/reports/invoices/index.html.erb
-- app/views/vyapari/store_manager/reports/sales/_index.html.erb
-- app/views/vyapari/store_manager/reports/sales/index.html.erb
-- app/views/vyapari/store_manager/reports/stock/_index.html.erb
-- app/views/vyapari/store_manager/reports/stock/index.html.erb
-- app/views/vyapari/store_manager/stock_bundles/_form.html.erb
-- app/views/vyapari/store_manager/stock_bundles/_index.html.erb
-- app/views/vyapari/store_manager/stock_bundles/_row.html.erb
-- app/views/vyapari/store_manager/stock_bundles/_show.html.erb
-- app/views/vyapari/store_manager/stock_bundles/create.html.erb
-- app/views/vyapari/store_manager/stock_bundles/index.html.erb
-- app/views/vyapari/store_manager/stock_bundles/update.html.erb
-- app/views/vyapari/store_manager/stock_entries/_form.html.erb
-- app/views/vyapari/store_manager/stock_entries/_index.html.erb
-- app/views/vyapari/store_manager/stock_entries/_row.html.erb
-- app/views/vyapari/store_manager/stock_entries/_show.html.erb
-- app/views/vyapari/store_manager/stock_entries/_stock_bundle.html.erb
-- app/views/vyapari/store_manager/stock_entries/index.html.erb
-- app/views/vyapari/terminal_staff/dashboard/_counts.html.erb
-- app/views/vyapari/terminal_staff/dashboard/_invoices.html.erb
-- app/views/vyapari/terminal_staff/dashboard/_search_form.html.erb
-- app/views/vyapari/terminal_staff/dashboard/_search_results.html.erb
-- app/views/vyapari/terminal_staff/dashboard/index.html.erb
-- app/views/vyapari/terminal_staff/dashboard/search.js.erb
-- app/views/vyapari/terminal_staff/invoices/_draft.html.erb
-- app/views/vyapari/terminal_staff/invoices/_form.html.erb
-- app/views/vyapari/terminal_staff/invoices/_index.html.erb
-- app/views/vyapari/terminal_staff/invoices/_row.html.erb
-- app/views/vyapari/terminal_staff/invoices/_show.html.erb
-- app/views/vyapari/terminal_staff/invoices/index.html.erb
-- app/views/vyapari/terminal_staff/invoices/new.js.erb
-- app/views/vyapari/terminal_staff/invoices/show.html.erb
-- app/views/vyapari/terminal_staff/invoices/show.js.erb
-- app/views/vyapari/terminal_staff/line_items/_form.html.erb
-- app/views/vyapari/terminal_staff/line_items/_index.html.erb
-- app/views/vyapari/terminal_staff/line_items/create.js.erb
-- app/views/vyapari/terminal_staff/line_items/destroy.js.erb
-- app/views/vyapari/user_dashboard/index.html.erb
+- app/views/vyapari/admin/users/_form.html.erb
+- app/views/vyapari/admin/users/_index.html.erb
+- app/views/vyapari/admin/users/_row.html.erb
+- app/views/vyapari/admin/users/_show.html.erb
+- app/views/vyapari/admin/users/index.html.erb
 - config/routes.rb
-- db/import_data/brands.csv
-- db/import_data/categories.csv
-- db/import_data/countries.csv
-- db/import_data/dummy/brands.csv
-- db/import_data/dummy/categories.csv
-- db/import_data/dummy/countries.csv
-- db/import_data/dummy/exchange_rates.csv
-- db/import_data/dummy/products-copy.csv
-- db/import_data/dummy/products.csv
-- db/import_data/dummy/products.xlsx
-- db/import_data/dummy/regions.csv
-- db/import_data/dummy/stores.csv
-- db/import_data/dummy/suppliers.csv
-- db/import_data/dummy/terminals.csv
-- db/import_data/exchange_rates.csv
-- db/import_data/regions.csv
-- db/import_data/stores.csv
-- db/import_data/suppliers.csv
-- db/import_data/terminals.csv
 - db/migrate/20170000000200_create_exchange_rates.rb
 - db/migrate/20170000000201_create_countries.rb
 - db/migrate/20170000000202_create_regions.rb
-- db/migrate/20170000000203_create_contacts.rb
-- db/migrate/20170000000204_create_bank_accounts.rb
-- db/migrate/20170000000205_create_suppliers.rb
-- db/migrate/20170000000206_create_stores.rb
-- db/migrate/20170000000207_create_terminals.rb
-- db/migrate/20170000000210_create_brands.rb
-- db/migrate/20170000000211_create_categories.rb
-- db/migrate/20170000000212_create_products.rb
-- db/migrate/20170000000213_create_invoices.rb
-- db/migrate/20170000000215_create_stock_bundles.rb
-- db/migrate/20170000000216_create_stock_entries.rb
-- db/sample_reports/products.xlsx
-- lib/tasks/vyapari/all.rake
+- lib/tasks/vyapari_tasks.rake
 - lib/vyapari.rb
 - lib/vyapari/engine.rb
 - lib/vyapari/version.rb
@@ -538,9 +386,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1