From a794ef924475c09abe11b0ea4aa8b5fce83fb7a9 Mon Sep 17 00:00:00 2001
From: Chirag Bhatt <chiragbhattsvkd@gmail.com>
Date: Tue, 12 Oct 2021 00:00:44 +0530
Subject: [PATCH 1/2] Added item wise discounts

---
 css/style.css |  2 +-
 index.html    | 14 +++++++++-----
 js/main.js    | 17 +++++++++--------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/css/style.css b/css/style.css
index f36dfe9..aa69a67 100644
--- a/css/style.css
+++ b/css/style.css
@@ -118,7 +118,7 @@ body{
 }
 
 div.container{
-  width: 800px;
+  width: 850px;
 }
 
 #imgInp{
diff --git a/index.html b/index.html
index 2dc999d..3f1ed33 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
         <div class="input-container"><input type="text" ng-model="invoice.customer_info.address2"/></div>
         <div class="input-container"><input type="text" ng-model="invoice.customer_info.postal"/></div>
         <div class="input-container" data-ng-hide='printMode'>
-          <select ng-model='currencySymbol' ng-options='currency.symbol as currency.name for currency in availableCurrencies'></select>
+          <select ng-model='currencySymbol'  ng-options='currency.symbol as currency.name for currency in availableCurrencies'></select>
         </div>
       </div>
       <div class="col-xs-6 right">
@@ -55,16 +55,17 @@
     <div class="items-table">
       <div class="row header">
         <div class="col-xs-1">&nbsp;</div>
-        <div class="col-xs-5">Description</div>
+        <div class="col-xs-3">Description</div>
         <div class="col-xs-2">Quantity</div>
         <div class="col-xs-2">Cost {{currencySymbol}}</div>
+        <div class="col-xs-2">Discount {{currencySymbol}}</div>
         <div class="col-xs-2 text-right">Total</div>
       </div>
       <div class="row invoice-item" ng-repeat="item in invoice.items" ng-animate="'slide-down'">
         <div class="col-xs-1 remove-item-container">
           <a href ng-hide="printMode" ng-click="removeItem(item)" class="btn btn-danger">[X]</a>
         </div>
-        <div class="col-xs-5 input-container">
+        <div class="col-xs-3 input-container">
           <input ng-model="item.description" placeholder="Description" />
         </div>
         <div class="col-xs-2 input-container">
@@ -73,8 +74,11 @@
         <div class="col-xs-2 input-container">
           <input ng-model="item.cost" value="0.00" ng-required ng-validate="number" size="6" placeholder="Cost" />
         </div>
+        <div class="col-xs-2 input-container">
+          <input ng-model="item.discount" value="0.00" ng-required ng-validate="number" size="6" placeholder="Discount" />
+        </div>
         <div class="col-xs-2 text-right input-container">
-          {{item.cost * item.qty | currency: currencySymbol}}
+          {{(item.cost - item.discount) * item.qty  | currency: currencySymbol}}
         </div>
       </div>
       <div class="row invoice-item">
@@ -103,7 +107,7 @@
     </div>
   </div>
 
-  <div ng-hide="printMode" class="copy noPrint">
+  <div ng-hide="Mode" class="copy noPrint">
     <a href="https://jasdeep.ca/?utm_source=angular_invoicing">Jasdeep Singh</a> &amp;
     <a href="https://github.com/manpreetrules">Manpreet Singh</a>
     Made with
diff --git a/js/main.js b/js/main.js
index d17b9af..592ae05 100644
--- a/js/main.js
+++ b/js/main.js
@@ -22,7 +22,7 @@ angular.module('invoicing', [])
     postal: 'M5S 1B6'
   },
   items:[
-    { qty: 10, description: 'Gadget', cost: 9.95 }
+    { qty: 0, description: '', cost: 0, discount: 0 }
   ]
 })
 
@@ -93,6 +93,10 @@ angular.module('invoicing', [])
 
   service.all = function() {
     return [
+      {
+        name: 'Indian Rupee (₹)',
+        symbol: '₹'
+      },
       {
         name: 'British Pound (£)',
         symbol: '£'
@@ -105,10 +109,7 @@ angular.module('invoicing', [])
         name: 'Euro (€)',
         symbol: '€'
       },
-      {
-        name: 'Indian Rupee (₹)',
-        symbol: '₹'
-      },
+      
       {
         name: 'Norwegian krone (kr)',
         symbol: 'kr '
@@ -129,7 +130,7 @@ angular.module('invoicing', [])
   function($scope, $http, DEFAULT_INVOICE, DEFAULT_LOGO, LocalStorage, Currency) {
 
   // Set defaults
-  $scope.currencySymbol = '$';
+  $scope.currencySymbol = '₹';
   $scope.logoRemoved = false;
   $scope.printMode   = false;
 
@@ -151,7 +152,7 @@ angular.module('invoicing', [])
   })()
   // Adds an item to the invoice's items
   $scope.addItem = function() {
-    $scope.invoice.items.push({ qty:0, cost:0, description:"" });
+    $scope.invoice.items.push({ qty:0, cost:0, description:"",discount:0 });
   }
 
   // Toggle's the logo
@@ -179,7 +180,7 @@ angular.module('invoicing', [])
   $scope.invoiceSubTotal = function() {
     var total = 0.00;
     angular.forEach($scope.invoice.items, function(item, key){
-      total += (item.qty * item.cost);
+      total += (item.qty * (item.cost - item.discount));
     });
     return total;
   };

From 065c1ef47f272ebb435f95f5555524cc6563aeb8 Mon Sep 17 00:00:00 2001
From: Chirag Bhatt <chiragbhattsvkd@gmail.com>
Date: Tue, 12 Oct 2021 00:49:42 +0530
Subject: [PATCH 2/2] fixed some design issue and added icon for add remove
 icons

---
 images/Add item.png   | Bin 0 -> 387 bytes
 images/Trash item.png | Bin 0 -> 416 bytes
 index.html            |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 images/Add item.png
 create mode 100644 images/Trash item.png

diff --git a/images/Add item.png b/images/Add item.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bbbfa85fddb977db8a22fee63052c404e087516
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?-
zjUdc;OxLp)$dD{?jVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw{mw>;fq{|1)5S5w
zqx0=lU#>$20&eqN->ee7QzfgfuylKXzUJ5TrP8i3uXt~*>+SZ*SsOA*Nbm^%CXZQr
zW~N-K3D9H_JHV#F`1FQXq_z09$;S@tW8Sj%ZOhLScMj+~Fu9!N(Gg(`eh|Vfq;x##
z!D7A#%iIox&M<CRTO!0?usCE!c7u~uY~NDfjRwUlxRMw1L`0nnZFqI{f$eEmzhdUo
zIaaT?GpFqNx6tkE$7_f7a~Ev(`+QdS&;3R3*<V<nJ71t}_hIJoJdHCp41GoxA0-ZK
z;9FoDvT*K+=?~|ul=SP^X5L!1NaXLl-CAz5r!~HBX#8ohj`d^SFE{3!mu9W{ptqJG
e>`+BY9eZ|DtKv=H$zOp1#^CAd=d#Wzp$P!rE1VYq

literal 0
HcmV?d00001

diff --git a/images/Trash item.png b/images/Trash item.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f26da1d0bb7ab310e5815ab7a12e6296819fb44
GIT binary patch
literal 416
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?-
zjUdc;OxLp)$dD{?jVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw{mw>;fq_xh)5S5w
zqx0?6y<W_YBCHSmdwW}bw`>Xh<LMQD^w##1+#Ghz+r+|@SfpK#INcTrYnsc|CUEUg
zr18x)yI=2$=wQz)tbaCVX7x<TQx}hMws|!1I<JY{R<W?jfxp_~h^1bEbdtBl+5>?d
z#$Spb{hhG7hwq*5t$^$AHcVD8xWiDH<*xa%MrFgNxsRtMnEF51=-BALZl}hMj;(Dh
zat2LdA~K1RyX{r>`<(oI!Ps_<IgiqR&4^e0PQH7Vi3=YyZkXOv-;np@J-hcsUeoxZ
zEnSl;_{4s@{+u~$lkk;;BFEQrr}Rg&*Y9!tZ#?7SiQO5UCzW^P{Zh+MePw;4;}6UF
z(6WH<i)X%c*ydUgyseojCS3E@G0|hI-q*Z&JoDa}Nqd>^f9S~h9ev~hFf<uFUHx3v
IIVCg!0JN5@%K!iX

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index 3f1ed33..2a05208 100644
--- a/index.html
+++ b/index.html
@@ -63,7 +63,7 @@
       </div>
       <div class="row invoice-item" ng-repeat="item in invoice.items" ng-animate="'slide-down'">
         <div class="col-xs-1 remove-item-container">
-          <a href ng-hide="printMode" ng-click="removeItem(item)" class="btn btn-danger">[X]</a>
+          <img src="images/Trash item.png" ng-hide="printMode" ng-click="removeItem(item)" />
         </div>
         <div class="col-xs-3 input-container">
           <input ng-model="item.description" placeholder="Description" />
@@ -83,11 +83,11 @@
       </div>
       <div class="row invoice-item">
         <div class="col-xs-12 add-item-container" ng-hide="printMode">
-          <a class="btn btn-primary" href ng-click="addItem()" >[+]</a>
+          <img src="images/Add item.png" ng-click="addItem()" />
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-10 text-right">Sub Total</div>
+        <div class="col-xs-10 text-right" style="padding-right: 50px;">Sub Total</div>
         <div class="col-xs-2 text-right">{{invoiceSubTotal() | currency: currencySymbol}}</div>
       </div>
       <div class="row">
@@ -95,7 +95,7 @@
         <div class="col-xs-2 text-right">{{calculateTax() | currency: currencySymbol}}</div>
       </div>
       <div class="row">
-        <div class="col-xs-10 text-right">Grand Total:</div>
+        <div class="col-xs-10 text-right" style="padding-right: 32px;">Grand Total:</div>
         <div class="col-xs-2 text-right">{{calculateGrandTotal() | currency: currencySymbol}}</div>
       </div>
     </div>