notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

you can unvoid an invoice.

Browse Source
This commit is contained in:
BC
2019-02-13 23:40:55 -08:00
parent 27f13ad38e
commit 99944a85c9
11 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
resources/public/finance-font/demo.html
View File

@@ -9,10 +9,42 @@
<link rel="stylesheet" href="style.css"></head>
<body>
<div class="bgc1 clearfix">
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;93)</small></h1>
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;95)</small></h1>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-bin-2">
</span>
<span class="mls"> icon-bin-2</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e95e" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe95e;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-skull-2">
</span>
<span class="mls"> icon-skull-2</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e95d" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe95d;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-cash-payment-bag-1">

BIN
resources/public/finance-font/fonts/icomoon.eot
View File

Binary file not shown.

2
resources/public/finance-font/fonts/icomoon.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 KiB

After

Width:  |  Height:  |  Size: 243 KiB

BIN
resources/public/finance-font/fonts/icomoon.ttf
View File

Binary file not shown.

BIN
resources/public/finance-font/fonts/icomoon.woff
View File

Binary file not shown.

2
resources/public/finance-font/selection.json
View File

File diff suppressed because one or more lines are too long

16
resources/public/finance-font/style.css
View File

@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?fy2oti');
src: url('fonts/icomoon.eot?fy2oti#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?fy2oti') format('truetype'),
url('fonts/icomoon.woff?fy2oti') format('woff'),
url('fonts/icomoon.svg?fy2oti#icomoon') format('svg');
src: url('fonts/icomoon.eot?hut0vm');
src: url('fonts/icomoon.eot?hut0vm#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?hut0vm') format('truetype'),
url('fonts/icomoon.woff?hut0vm') format('woff'),
url('fonts/icomoon.svg?hut0vm#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -24,6 +24,12 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-bin-2:before {
content: "\e95e";
}
.icon-skull-2:before {
content: "\e95d";
}
.icon-cash-payment-bag-1:before {
content: "\e900";
}

1
src/cljs/auto_ap/routes.cljs
View File

@@ -17,5 +17,6 @@
"import" :import-invoices
"unpaid" :unpaid-invoices
"paid" :paid-invoices
"voided" :voided-invoices
"new" :new-invoice}
"transactions/" {"" :transactions}}])

2
src/cljs/auto_ap/views/components/invoice_table.cljs
View File

@@ -188,7 +188,7 @@
(when (and on-edit-invoice (not= ":voided" (:status i)))
[:button.button {:on-click (fn [] (on-edit-invoice i))} [:span.icon [:i.fa.fa-pencil]]])
(when (and on-void-invoice (= (:outstanding-balance i) (:total i)) (not= ":voided" (:status i)))
[:button.button.is-warning.is-outlined {:on-click (fn [] (on-void-invoice i))} [:span [:span.icon [:i.fa.fa-minus-circle]]]])
[:button.button.is-outlined {:on-click (fn [] (on-void-invoice i))} [:span.icon [:span.icon-bin-2 {:style {:font-weight "400"}}]]])
(when (and on-unvoid-invoice (= ":voided" (:status i)))
[:button.button.is-outlined {:on-click (fn [] (on-unvoid-invoice i))} [:span [:span.icon [:i.fa.fa-undo]]]])
(when (seq payments)

19
src/cljs/auto_ap/views/components/invoices/side_bar.cljs
View File

@@ -12,7 +12,8 @@
[auto-ap.events :as events]))
(defn invoices-side-bar [params & rest]
(let [ap @(re-frame/subscribe [::subs/active-page])]
(let [ap @(re-frame/subscribe [::subs/active-page])
user @(re-frame/subscribe [::subs/user])]
[:div
[:div [:p.menu-label "Type"]
[:ul.menu-list
@@ -29,12 +30,20 @@
[:span {:class "name"} "Paid Invoices"]]]
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :import-invoices)
:class [(active-when ap = :import-invoices)]}
[:a.item {:href (bidi/path-for routes/routes :voided-invoices)
:class [(active-when ap = :voided-invoices)]}
[:span {:class "icon icon-accounting-document" :style {:font-size "25px"}}]
[:span {:class "icon icon-bin-2" :style {:font-size "25px"}}]
[:span {:class "name"} "Import Invoices"]]]]]
[:span {:class "name"} "Voided Invoices"]]]
(when (= "admin" (:user/role user))
[:li.menu-item
[:a.item {:href (bidi/path-for routes/routes :import-invoices)
:class [(active-when ap = :import-invoices)]}
[:span {:class "icon icon-accounting-document" :style {:font-size "25px"}}]
[:span {:class "name"} "Import Invoices"]]])]]
[:div
rest]
[:div {:class "compose has-text-centered"}

4
src/cljs/auto_ap/views/main.cljs
View File

@@ -33,6 +33,10 @@
(defmethod page :paid-invoices [_]
(unpaid-invoices-page {:status "paid"}))
(defmethod page :voided-invoices [_]
(unpaid-invoices-page {:status "voided"}))
(defmethod page :checks [_]
(checks-page))