vyapari 0.1.4 → 0.1.5dev

data/app/views/vyapari/admin/brands/_show.html.erb

@@ -0,0 +1,104 @@
+<div id="div_brand_show">
+	<% status_hash = {published: "success", unpublished: "default", removed: "danger"} %>
+
+	<div class="row">
+
+	  <div class="col-md-7 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+	  	
+	  	<%= edit_image(@brand, 
+	                  "brand_image.image.large.url",
+	                  upload_image_link(@brand, :brand_image, nil ),
+	                  remove_image_link(@brand, :brand_image, nil ),
+	                  image_options: {assoc_name: :brand_image }) %>
+	  
+	  	<div class="visible-sm visible-xs mt-50"></div>
+
+	  	<%= clear_tag(10) %>
+
+	  	<%= theme_panel_heading(@brand.name) %>
+
+	    <%= clear_tag(10) %>
+
+	    <span class="ml-5 mt-5 label label-<%= status_hash[@brand.status.to_sym] %>"><%= @brand.status.titleize %></span>
+
+	  	<% if @brand.featured? %>
+	      <span class="mr-10 mt-5 label label-info">Featured</span>
+	    <% end %>
+	    
+	    <%= clear_tag(10) %>
+
+	    <div class="visible-sm visible-xs mb-50"></div>
+
+	    </div>
+
+	  <div class="col-md-5 col-sm-12 col-xs-12">
+
+	  	<% edit_link = edit_admin_brand_path(id: @brand.id) %>
+			<% delete_link = admin_brand_path(id: @brand.id) %>
+
+			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @brand.can_be_edited? %>
+
+	    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "btn btn-block btn-danger btn-only-hover" if @brand.can_be_deleted? && (@current_brand != @brand)  %>
+
+	    <!-- Publish -->
+	    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_brand_path(:id =>@brand.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" if @brand.can_be_published? %>
+
+	    <!-- Unpublish -->
+	    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_brand_path(:id =>@brand.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" if @brand.can_be_unpublished? %>
+	    	
+	    <!-- Remove -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove"), update_status_admin_brand_path(:id =>@brand.id, :status =>'removed'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @brand.can_be_removed? %>
+
+	    <!-- Feature -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Mark as Feature"), mark_as_featured_admin_brand_path(:id =>@brand.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" unless @brand.featured? %>
+
+	    <!-- Remove from Featuring -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove from Featuring"), remove_from_featured_admin_brand_path(:id =>@brand.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @brand.featured? %>
+
+	    <div class="visible-sm visible-xs mb-50"></div>
+
+	  </div>
+
+	</div>
+
+	<%= clear_tag(50) %>
+
+	<ul class="nav nav-pills">
+	  <li class="active">
+	    <a href="#technical_details" data-toggle="tab" aria-expanded="false">
+	      <span class="visible-xs"><i class="fa-database"></i></span>
+	      <span class="hidden-xs">Technical Details</span>
+	    </a>
+	  </li>
+	</ul>
+
+	<div class="tab-content">
+	  <div class="tab-pane active" id="technical_details">
+	    
+	    <%= clear_tag(20) %>
+
+	    <div class="table-responsive"> 
+				<table class="table table-striped table-condensed table-bordered mb-30"> 
+					<tbody>
+						
+						<tr>
+							<th>ID</th><td colspan="3"><%= @brand.id %></td>
+						</tr>
+						
+						<tr>
+							<th>Created At</th><td><%= @brand.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @brand.created_at %></td>
+							<th>Updated At</th><td><%= @brand.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @brand.updated_at %></td>
+						</tr>
+
+					</tbody>
+				</table>
+				
+			</div>
+
+	  </div>
+	</div>
+
+	<%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
+
+	<%= clear_tag %>
+</div>

data/app/views/vyapari/admin/brands/index.html.erb

@@ -0,0 +1,48 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <ul class="nav nav-tabs">
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active">
+
+        <div id="div_brand_action_buttons">
+          <div class="row">
+            <div class="col-md-6">
+              
+              <%= theme_button('Add a Brand', 'plus', new_admin_brand_path(), classes: "pull-left", btn_type: "success") %>
+
+              <%= theme_button('Refresh', 'refresh', admin_brands_path(), classes: "pull-left ml-10", btn_type: "white") %>
+
+              <!-- Single button -->
+              <div class="ml-10 btn-group hidden">
+                <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>
+                <ul class="dropdown-menu">
+                  <li><a href="#">Import Users</a></li>
+                  <li><a href="#">Import History</a></li>
+                  <li role="separator" class="divider"></li>
+                  <li><a href="#">Export Users</a></li>
+                </ul>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <%= search_form_kuppayam(Brand, admin_brands_path, text: @filters[:query]) %>
+            </div>
+          </div>
+        </div>
+        <%= clear_tag(10) %>
+
+        <div id="div_brand_index">
+          <%= render :partial=>"vyapari/admin/brands/index" %>
+        </div>
+        <%= clear_tag(10) %>
+
+      </div>
+    </div>
+
+  </div>
+
+</div>

data/app/views/vyapari/admin/categories/_form.html.erb

@@ -0,0 +1,28 @@
+<%= form_for([:admin, @category], :html => {:id=>"form_category", :class=>"mb-0 form-horizontal", :category => "form", :method => (@category.new_record? ? :post : :put), :remote=>true}) do |f| %>
+
+      <div id="category_form_error">
+        <%= @category.errors[:base].to_sentence %>
+      </div>
+
+      <div class="form-inputs mb-30 mt-30">
+        <%= theme_form_field(@category, :name) %>
+        <%= theme_form_field(@category, :one_liner) %>
+        <%= theme_form_field(@category, :priority) %>
+        
+        <% options = {assoc_collection: Category.where("id != ?", @category.id).select("id, name").order("name ASC").all, required: true, editable: true, assoc_display_method: :name} %>
+        <%= theme_form_assoc_group(@category, :parent_id, **options) %>
+      </div>
+    
+      <div>
+
+        <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
+        
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
+        
+      </div>
+      <%= clear_tag(10) %>
+
+  </div>
+
+<% end %>
+

data/app/views/vyapari/admin/categories/_index.html.erb

@@ -0,0 +1,101 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: center;width:60px">#</th> 
+				<th>Name</th>
+				<th>Parent Category</th>
+				<th>Top Category</th>
+				<th>Priority</th>
+				<th>Featured</th>
+				<th>Status</th>
+				<th style="text-align: center;" colspan="3">Actions</th>
+			</tr> 
+		</thead>
+		
+	  <tbody>
+	  	<% @categories.each_with_index do |category, i| %>
+	  		
+	  		<% edit_link = edit_admin_category_path(id: category.id) %>
+				<% delete_link = admin_category_path(id: category.id) %>
+				
+		    <tr id="tr_category_<%= category.id %>">
+		      
+		      <th scope="row" style="text-align: center;">
+						<% if i < 0 %>
+							<i class="fa fa-check text-success"></i>
+						<% else %>
+							<%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+						<% end %>
+					</th>
+
+		      <td class="category-name"><%= link_to category.name, admin_category_path(category), remote: true %></td>
+
+		      <td class="category-name"><%= link_to category.parent.name, admin_category_path(category), remote: true if category.parent %></td>
+
+		      <td class="category-name"><%= link_to category.top_parent.name, admin_category_path(category), remote: true if category.top_parent %></td>
+
+		      <td class="category-name"><%= category.priority%></td>
+
+		      <td class="hidden-xs hidden-sm">
+				  	<% if category.featured? %>
+				      <span class="mr-10 mt-5 label label-warning">Featured</span>
+				    <% end %>
+				  </td>
+
+				  <td>
+				  	<% if category.unpublished? %>
+				  		<span class="ml-5 mt-5 label label-default">Un-Published</span>
+				  	<% elsif category.published? %>
+				  		<span class="ml-5 mt-5 label label-success">Published</span>
+				  	<% elsif category.removed? %>
+				  		<span class="ml-5 mt-5 label label-danger">Removed</span>
+				  	<% end %>
+				  </td>
+
+				  <td class="action-links" style="width:10%">
+
+				    <!-- Mark as Featured -->
+				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Mark as Featured"), mark_as_featured_admin_category_path(:id =>category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"edit" unless category.featured? %>
+
+				    <!-- Remove from Featured -->
+				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Remove from Featured"), remove_from_featured_admin_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"" if category.featured? %>
+
+				    <!-- Make Parent -->
+				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Make Parent"), make_parent_admin_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"" unless category.parent.blank? %>
+
+				  </td>
+
+				  <td class="action-links" style="width:10%">
+
+		      	<!-- Publish -->
+				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_category_path(:id =>category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"edit" if category.can_be_published? %>
+
+				    <!-- Un-Publish -->
+				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"" if category.can_be_unpublished? %>
+
+				    <!-- Remove -->
+				    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove"), update_status_admin_category_path(:id =>category.id, :status =>'removed'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"delete" if category.can_be_removed? %>
+
+		      </td>
+
+		      <td class="action-links" style="width:10%">
+
+		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Brand"), edit_link, :remote=>true, class: "edit" if category.can_be_edited? %>
+
+		        <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, category: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if category.can_be_deleted? %>
+
+		      </td>
+
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@categories) %>
+  </div>
+</div>
+

data/app/views/vyapari/admin/categories/_row.html.erb

@@ -0,0 +1,69 @@
+<% edit_link = edit_admin_category_path(id: category.id) %>
+<% delete_link = admin_category_path(id: category.id) %>
+
+<tr id="tr_category_<%= category.id %>">
+
+  <th scope="row" style="text-align: center;">
+    <% if i < 0 %>
+    <i class="fa fa-check text-success"></i>
+    <% else %>
+    <%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+    <% end %>
+  </th>
+
+  <td class="category-name"><%= link_to category.name, admin_category_path(category), remote: true %></td>
+
+  <td class="category-name"><%= link_to category.parent.name, admin_category_path(category), remote: true if category.parent %></td>
+
+  <td class="category-name"><%= link_to category.top_parent.name, admin_category_path(category), remote: true if category.top_parent %></td>
+
+  <td class="category-name"><%= category.priority%></td>
+
+  <td class="hidden-xs hidden-sm">
+    <% if category.featured? %>
+    <span class="mr-10 mt-5 label label-warning">Featured</span>
+    <% end %>
+  </td>
+
+  <td>
+    <% if category.unpublished? %>
+    <span class="ml-5 mt-5 label label-default">Un-Published</span>
+    <% elsif category.published? %>
+    <span class="ml-5 mt-5 label label-success">Published</span>
+    <% elsif category.removed? %>
+    <span class="ml-5 mt-5 label label-danger">Removed</span>
+    <% end %>
+  </td>
+
+  <td class="action-links" style="width:10%">
+
+    <!-- Mark as Featured -->
+    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Mark as Featured"), mark_as_featured_admin_category_path(:id =>category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"edit" unless category.featured? %>
+
+    <!-- Remove from Featured -->
+    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Remove from Featured"), remove_from_featured_admin_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"" if category.featured? %>
+
+  </td>
+
+  <td class="action-links" style="width:10%">
+
+    <!-- Publish -->
+    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_category_path(:id =>category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"edit" if category.can_be_published? %>
+
+    <!-- Un-Publish -->
+    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_category_path(:id =>category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"" if category.can_be_unpublished? %>
+
+    <!-- Remove -->
+    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove"), update_status_admin_category_path(:id =>category.id, :status =>'removed'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"delete" if category.can_be_removed? %>
+
+  </td>
+
+  <td class="action-links" style="width:10%">
+
+    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Brand"), edit_link, :remote=>true, class: "edit" if category.can_be_edited? %>
+
+    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, category: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if category.can_be_deleted? %>
+
+  </td>
+
+</tr>

data/app/views/vyapari/admin/categories/_show.html.erb

@@ -0,0 +1,115 @@
+<div id="div_category_show">
+	<% status_hash = {published: "success", unpublished: "default", removed: "danger"} %>
+
+	<div class="row">
+
+	  <div class="col-md-7 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+	  	
+	  	<%= edit_image(@category, 
+	                  "category_image.image.large.url",
+	                  upload_image_link(@category, :category_image, nil ),
+	                  remove_image_link(@category, :category_image, nil ),
+	                  image_options: {assoc_name: :category_image }) %>
+	  
+	  	<div class="visible-sm visible-xs mt-50"></div>
+
+	  	<%= clear_tag(10) %>
+
+	  	<%= theme_panel_heading(@category.name) %>
+	  	<%= theme_panel_sub_heading(@category.parent.name, "#") if @category.parent %>
+	  	<%= theme_panel_sub_heading(@category.top_parent.name, "#") if @category.top_parent %>
+
+	    <%= clear_tag(10) %>
+
+	    <span class="ml-5 mt-5 label label-<%= status_hash[@category.status.to_sym] %>"><%= @category.status.titleize %></span>
+
+	  	<% if @category.featured? %>
+	      <span class="mr-10 mt-5 label label-info">Featured</span>
+	    <% end %>
+	    
+	    <%= clear_tag(10) %>
+
+	    <div class="mt-20" style="max-width: 100%;overflow: auto;max-height: 500px;">
+        <%= raw(@category.one_liner) %>
+      </div>
+
+	    <%= clear_tag(10) %>
+
+	    <div class="visible-sm visible-xs mb-50"></div>
+
+	    </div>
+
+	  <div class="col-md-5 col-sm-12 col-xs-12">
+
+	  	<% edit_link = edit_admin_category_path(id: @category.id) %>
+			<% delete_link = admin_category_path(id: @category.id) %>
+
+			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @category.can_be_edited? %>
+
+	    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "btn btn-block btn-danger btn-only-hover" if @category.can_be_deleted? && (@current_category != @category)  %>
+
+	    <!-- Publish -->
+	    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_admin_category_path(:id =>@category.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" if @category.can_be_published? %>
+
+	    <!-- Unpublish -->
+	    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Un-Publish"), update_status_admin_category_path(:id =>@category.id, :status =>'unpublished'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-gray btn-only-hover" if @category.can_be_unpublished? %>
+	    	
+	    <!-- Remove -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove"), update_status_admin_category_path(:id =>@category.id, :status =>'removed'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @category.can_be_removed? %>
+
+	    <!-- Feature -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Mark as Feature"), mark_as_featured_admin_category_path(:id =>@category.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" unless @category.featured? %>
+
+	    <!-- Remove from Featuring -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Remove from Featuring"), remove_from_featured_admin_category_path(:id =>@category.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" if @category.featured? %>
+
+	    <!-- Make Parent -->
+	    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Make Parent"), make_parent_admin_category_path(:id =>@category.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" unless @category.parent.blank? %>
+
+	    <div class="visible-sm visible-xs mb-50"></div>
+
+	  </div>
+
+	</div>
+
+	<%= clear_tag(50) %>
+
+	<ul class="nav nav-pills">
+	  <li class="active">
+	    <a href="#technical_details" data-toggle="tab" aria-expanded="false">
+	      <span class="visible-xs"><i class="fa-database"></i></span>
+	      <span class="hidden-xs">Technical Details</span>
+	    </a>
+	  </li>
+	</ul>
+
+	<div class="tab-content">
+	  <div class="tab-pane active" id="technical_details">
+	    
+	    <%= clear_tag(20) %>
+
+	    <div class="table-responsive"> 
+				<table class="table table-striped table-condensed table-bordered mb-30"> 
+					<tbody>
+						
+						<tr>
+							<th>ID</th><td colspan="3"><%= @category.id %></td>
+						</tr>
+						
+						<tr>
+							<th>Created At</th><td><%= @category.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.created_at %></td>
+							<th>Updated At</th><td><%= @category.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.updated_at %></td>
+						</tr>
+
+					</tbody>
+				</table>
+				
+			</div>
+
+	  </div>
+	</div>
+
+	<%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
+
+	<%= clear_tag %>
+</div>

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

@@ -1,37 +1,22 @@
 <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_user_action_buttons">
+        <div id="div_category_action_buttons">
           <div class="row">
             <div class="col-md-6">
               
-              <%= theme_button('Add a User', 'plus', new_admin_user_path(), classes: "pull-left", btn_type: "success") %>
+              <%= theme_button('Add a Category', 'plus', new_admin_category_path(), classes: "pull-left", btn_type: "success") %>
 
-              <%= theme_button('Refresh', 'refresh', admin_users_path(), classes: "pull-left ml-10", btn_type: "white") %>
+              <%= theme_button('Refresh', 'refresh', admin_categories_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
               <!-- Single button -->
-              <div class="ml-10 btn-group">
+              <div class="ml-10 btn-group hidden">
                 <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>
@@ -42,17 +27,16 @@
                   <li><a href="#">Export Users</a></li>
                 </ul>
               </div>
-
             </div>
             <div class="col-md-6">
-              <%= search_form_kuppayam(User, admin_users_path, text: @filters[:query]) %>
+              <%= search_form_kuppayam(Category, admin_categories_path, text: @filters[:query]) %>
             </div>
           </div>
         </div>
         <%= clear_tag(10) %>
 
-        <div id="div_user_index">
-          <%= render :partial=>"usman/admin/users/index" %>
+        <div id="div_category_index">
+          <%= render :partial=>"vyapari/admin/categories/index" %>
         </div>
         <%= clear_tag(10) %>
 

data/app/views/vyapari/admin/countries/_index.html.erb

@@ -2,7 +2,7 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:20px">#</th> 
+				<th style="text-align: center;width:60px">#</th> 
 				<th>Name</th>
 				<th>Code</th>
 				<th style="text-align: center;">Actions</th>

data/app/views/vyapari/admin/countries/index.html.erb

@@ -9,10 +9,26 @@
 
         <div id="div_country_action_buttons">
           <div class="row">
-            <div class="col-md-4">
-              <%= link_to raw("<i class='fa fa-plus mr-10'></i><span class='btn-text'> New Country</span>"), new_admin_country_path, :class=>"btn btn-primary pull-left mb-5", :remote=>true %>
+            <div class="col-md-6">
+              
+              <%= theme_button('Add a Country', 'plus', new_admin_country_path(), classes: "pull-left", btn_type: "success") %>
+
+              <%= theme_button('Refresh', 'refresh', admin_countries_path(), classes: "pull-left ml-10", btn_type: "white") %>
+
+              <!-- Single button -->
+              <div class="ml-10 btn-group hidden">
+                <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>
+                <ul class="dropdown-menu">
+                  <li><a href="#">Import Users</a></li>
+                  <li><a href="#">Import History</a></li>
+                  <li role="separator" class="divider"></li>
+                  <li><a href="#">Export Users</a></li>
+                </ul>
+              </div>
             </div>
-            <div class="col-md-8">
+            <div class="col-md-6">
               <%= search_form_kuppayam(Country, admin_countries_path, text: @filters[:query]) %>
             </div>
           </div>

data/app/views/vyapari/admin/exchange_rates/_form.html.erb

@@ -5,12 +5,11 @@
       </div>
 
       <div class="form-inputs mb-30 mt-30">
-        <%= theme_form_field(@exchange_rate, :currency_name) %>
+        <%= theme_form_field(@exchange_rate, :base_currency) %>
+        <%= theme_form_field(@exchange_rate, :counter_currency) %>
         <%= theme_form_field(@exchange_rate, :value) %>
         <%= theme_form_field(@exchange_rate, :effective_date, html_options: {type: :date}) %>
-
-        <% options = {assoc_collection: Country.select("id, name").order("name ASC").all, required: true, editable: true, assoc_display_method: :name} %>
-        <%= theme_form_assoc_group(@exchange_rate, :country_id, **options) %>
+        
       </div>
     
       <div>

data/app/views/vyapari/admin/exchange_rates/_index.html.erb

@@ -2,9 +2,9 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:20px">#</th> 
-				<th>Currency Name</th>
-				<th>Country</th>
+				<th style="text-align: center;width:60px">#</th> 
+				<th>Base Currency</th>
+				<th>Counter Currency</th>
 				<th style="width:10%">Value</th>
 				<th style="width:20%">Effective Date</th>
 				<th style="text-align: center;">Actions</th>
@@ -27,17 +27,17 @@
 						<% end %>
 					</th>
 
-		      <td class="exchange_rate-name"><%= link_to exchange_rate.currency_name, admin_exchange_rate_path(exchange_rate), remote: true %></td>
+		      <td class="exchange_rate-name"><%= link_to exchange_rate.base_currency, admin_exchange_rate_path(exchange_rate), remote: true %></td>
 
-		      <td><%= exchange_rate.country.name if exchange_rate.country %></td>
+		      <td class="exchange_rate-name"><%= link_to exchange_rate.counter_currency, admin_exchange_rate_path(exchange_rate), remote: true %></td>
 
-					<td><%= number_with_precision(exchange_rate.value, :precision => 2)  %></td>
+		      <td><%= number_with_precision(exchange_rate.value, :precision => 2)  %></td>
 
 					<td><%= exchange_rate.effective_date.strftime("%m/%d/%Y") %></td>
 
 					<td class="action-links" style="width:10%">
 
-		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit ExchangeRate"), edit_link, :remote=>true, class: "edit" %>
+		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit"), edit_link, :remote=>true, class: "edit" %>
 
 		        <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, exchange_rate: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
 

data/app/views/vyapari/admin/exchange_rates/_row.html.erb

@@ -11,9 +11,9 @@
     <% end %>
   </th>
 
-  <td class="exchange_rate-name"><%= link_to exchange_rate.currency_name, admin_exchange_rate_path(exchange_rate), remote: true %></td>
+  <td class="exchange_rate-name"><%= link_to exchange_rate.base_currency, admin_exchange_rate_path(exchange_rate), remote: true %></td>
 
-  <td><%= exchange_rate.country.name if exchange_rate.country %></td>
+  <td class="exchange_rate-name"><%= link_to exchange_rate.counter_currency, admin_exchange_rate_path(exchange_rate), remote: true %></td>
 
   <td><%= number_with_precision(exchange_rate.value, :precision => 2)  %></td>
 
@@ -21,7 +21,7 @@
 
   <td class="action-links" style="width:10%">
 
-    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit ExchangeRate"), edit_link, :remote=>true, class: "edit" %>
+    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit"), edit_link, :remote=>true, class: "edit" %>
 
     <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, exchange_rate: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>