commission update -> change route under settings

app/views/layouts/_header.html.erb

@@ -28,8 +28,8 @@
               <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
               <hr class="hr_advance" />
               <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Commissions",   origami_commissions_path  , :tabindex =>"-1" %></li>
-              <li><%= link_to "Commissioners",   origami_commissioners_path  , :tabindex =>"-1" %></li>
+              <li><%= link_to "Commissions",   settings_commissions_path  , :tabindex =>"-1" %></li>
+              <li><%= link_to "Commissioners",   settings_commissioners_path  , :tabindex =>"-1" %></li>
               <hr class="hr_advance" />
               <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
               <hr class="hr_advance" />

app/views/origami/commissioners/_form.html.erb

@@ -1,21 +0,0 @@
-<div class="col-md-3">
-  <%= simple_form_for([:origami, @commissioner]) do |f| %>
-      <%= f.error_notification %>
-
-      <div class="form-inputs">
-        <%= f.input :name %>
-        <%=	f.label :emp_id %>
-        <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %><br/>
-         <%= f.label :commission_type %>
-         <%= f.select :commission_type, Commission.all.map{ |l| [l.menu_item.name, l.id] } %>
-          <br/>
-          <label><%= f.check_box :is_active %> Active </label>
-      </div><br/>
-
-
-      <div class="form-actions">
-        <%= link_to 'Back', origami_commissioners_path, class: 'btn btn-success' %>
-        <%= f.button :submit, class: 'btn btn-info' %>
-      </div>
-  <% end %>
-</div>

app/views/settings/commissioners/_form.html.erb

@@ -0,0 +1,22 @@
+<div class="col-md-3">
+  <%= simple_form_for([:settings, @commissioner]) do |f| %>
+      <%= f.error_notification %>
+
+      <div class="form-inputs">
+        <%= f.input :name %>
+        <%= f.label :emp_id, 'Employee' %>
+        <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
+        <br/>
+        <%= f.label :commission_id, 'Commission' %><br/>
+        <%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, {prompt: 'Select a Product'}, {class: 'form-control'} %>
+        <br/>
+        <label><%= f.check_box :is_active %> Active </label>
+      </div>
+      <br/>
+
+      <div class="form-actions">
+        <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %>
+        <%= f.button :submit, class: 'btn btn-info' %>
+      </div>
+  <% end %>
+</div>

app/views/settings/commissioners/edit.html.erb

@@ -1,8 +1,8 @@
 <div class="span12">
 	<div class="page-header">
 	 <ul class="breadcrumb">
-	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%=  origami_commissioners_path  %>">Commissioners</a></li>
+	   	<li><a href="<%= settings_commissioners_path %>">Home</a></li>
+			<li><a href="<%= settings_commissioners_path  %>">Commissioners</a></li>
 	  	<li>Edit</li>
 	 </ul>
 	</div>

app/views/settings/commissioners/index.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
+    <li><a href="<%= settings_commissioners_path %>">Home</a></li>
     <li>Commissioner</li>
     <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commissioner_path, :class => 'btn btn-primary btn-sm' %>
+    <%= link_to t('.new', :default => t("helpers.links.new")), new_settings_commissioner_path, :class => 'btn btn-primary btn-sm' %>
   </span>
   </ul>
 </div>
@@ -30,9 +30,9 @@
           </td>
           <td><%= commissioner.commission.menu_item.name rescue '-' %></td>
           <td><%= commissioner.is_active %></td>
-          <td><%= link_to 'Show', origami_commissioner_path(commissioner) %></td>
-          <td><%= link_to 'Edit', edit_origami_commissioner_path(commissioner) %></td>
-          <td><%= link_to 'Destroy', origami_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+          <td><%= link_to 'Show', settings_commissioner_path(commissioner) %></td>
+          <td><%= link_to 'Edit', edit_settings_commissioner_path(commissioner) %></td>
+          <td><%= link_to 'Destroy', settings_commissioner_path(commissioner), method: :delete, data: {confirm: 'Are you sure?'} %></td>
         </tr>
     <% end %>
     </tbody>

app/views/settings/commissioners/new.html.erb

@@ -1,8 +1,8 @@
 <div class="span12">
 	<div class="page-header">
 	 <ul class="breadcrumb">
-	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%=  origami_commissioners_path  %>">Commissioners</a></li>
+	   	<li><a href="<%= settings_commissioners_path %>">Home</a></li>
+			<li><a href="<%=  settings_commissioners_path  %>">Commissioners</a></li>
 	  	<li>New</li>
 	 </ul>
 	</div>

app/views/settings/commissioners/show.html.erb

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
-    <li><a href="<%= origami_commissioners_path %>">Commissioners</a></li>
+    <li><a href="<%= settings_commissioner_path %>">Home</a></li>
+    <li><a href="<%= settings_commissioner_path %>">Commissioners</a></li>
 
     <span style="float: right">
   </span>
@@ -38,9 +38,9 @@
       </tr>
       </tbody>
     </table>
-    <%= link_to 'Back', origami_commissioners_path, class: 'btn btn-success' %>
-    <%= link_to 'Edit', edit_origami_commissioner_path(@commissioner), class: 'btn btn-info' %>
-    <%= link_to 'Destroy', origami_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
+    <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %>
+    <%= link_to 'Edit', edit_settings_commissioner_path(@commissioner), class: 'btn btn-info' %>
+    <%= link_to 'Destroy', settings_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
   </div>
 </div>
 

app/views/settings/commissions/_form.html.erb

@@ -1,17 +1,17 @@
 <div class="col-md-3">
-<%= simple_form_for([:origami,@commission]) do |f| %>
+<%= simple_form_for([:settings,@commission]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.label :product_id %>
-    <%= f.collection_select :product_id, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
-    <%= f.input :amount %>
+    <%= f.label :product_code, 'Product' %>
+    <%= f.collection_select :product_code, @products, :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
     <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
+    <%= f.input :amount %>
     <label><%= f.check_box :is_active %> Active </label>
     
   </div><br>
   <div class="form-actions">
-    <%= link_to 'Back', origami_commissions_path, class: 'btn btn-success' %>
+    <%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>
     <%= f.button :submit, class: 'btn btn-info' %>
   </div>
 <% end %>

app/views/settings/commissions/edit.html.erb

@@ -1,8 +1,8 @@
 <div class="span12">
 	<div class="page-header">
 	 <ul class="breadcrumb">
-	   	<li><a href="<%= origami_root_path %>">Home</a></li>
-			<li><a href="<%= origami_commissions_path   %>">Commissions</a></li>
+	   	<li><a href="<%= settings_commissions_path %>">Home</a></li>
+			<li><a href="<%= settings_commissions_path   %>">Commissions</a></li>
 	  	<li>Edit</li>
 	 </ul>
 	</div>

app/views/settings/commissions/index.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
+    <li><a href="<%= settings_commissions_path %>">Home</a></li>
     <li>Commissions</li>
     <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commission_path, :class => 'btn btn-primary btn-sm' %>
+    <%= link_to t('.new', :default => t("helpers.links.new")), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %>
   </span>
   </ul>
 </div>
@@ -28,9 +28,9 @@
           <td><%= commission.amount rescue '-' %></td>
           <td><%= commission.commission_type rescue '-' %></td>
           <td><%= commission.is_active rescue '-' %></td>
-          <td><%= link_to 'Show', origami_commission_path(commission) %></td>
-          <td><%= link_to 'Edit', edit_origami_commission_path(commission) %></td>
-          <td><%= link_to 'Destroy', origami_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %></td>
+          <td><%= link_to 'Show', settings_commissions_path(commission) %></td>
+          <td><%= link_to 'Edit', edit_settings_commission_path(commission) %></td>
+          <td><%= link_to 'Destroy', settings_commission_path(commission), method: :delete, data: {confirm: 'Are you sure?'} %></td>
         </tr>
     <% end %>
     </tbody>

app/views/settings/commissions/new.html.erb

@@ -1,8 +1,8 @@
 <div class="span12">
   <div class="page-header">
     <ul class="breadcrumb">
-      <li><a href="<%= origami_root_path %>">Home</a></li>
-      <li><a href="<%= origami_commissions_path %>">Commissions</a></li>
+      <li><a href="<%= settings_commissions_path %>">Home</a></li>
+      <li><a href="<%= settings_commissions_path %>">Commissions</a></li>
       <li>New</li>
     </ul>
   </div>

app/views/settings/commissions/show.html.erb

@@ -2,8 +2,8 @@
 
 <div class="page-header">
   <ul class="breadcrumb">
-    <li><a href="<%= origami_root_path %>">Home</a></li>
-    <li><a href="<%= origami_commissions_path %>">Commissions</a></li>
+    <li><a href="<%= settings_commissions_path %>">Home</a></li>
+    <li><a href="<%= settings_commissions_path %>">Commissions</a></li>
 
     <span style="float: right">
   </span>
@@ -32,9 +32,9 @@
       </tr>
       </tbody>
     </table>
-    <%=	 link_to 'Back', origami_commissions_path, class: 'btn btn-success' %>
-    <%= link_to 'Edit', edit_origami_commission_path(@commission), class: 'btn btn-info' %>
-    <%= link_to 'Destroy', origami_commission_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
+    <%=	 link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>
+    <%= link_to 'Edit', edit_settings_commission_path(@commission), class: 'btn btn-info' %>
+    <%= link_to 'Destroy', settings_commissions_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
   </div>
 </div>