From d24a4a24ed2b7828d95055e9c1a4570fc5cbb7e0 Mon Sep 17 00:00:00 2001 From: faxblaster Date: Mon, 19 Jul 2021 10:22:27 -0400 Subject: [PATCH 1/4] Add refund icon --- resources/js/components/ChargesTable.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/js/components/ChargesTable.vue b/resources/js/components/ChargesTable.vue index ad24921..9c855ee 100644 --- a/resources/js/components/ChargesTable.vue +++ b/resources/js/components/ChargesTable.vue @@ -36,7 +36,15 @@ - {{ charge.id }} + + {{ charge.id }} + + Refunded + + + + + {{ charge.currency | money(charge.amount) }} {{ charge.created | date }} {{ charge.status }} From bab24b650a5c75e514f82ccbbca2c2a794ca174d Mon Sep 17 00:00:00 2001 From: faxblaster Date: Mon, 19 Jul 2021 11:40:51 -0400 Subject: [PATCH 2/4] add color to status --- dist/js/tool.js | 89 ++++++++++++++++++++---- resources/js/components/ChargesTable.vue | 38 +++++----- 2 files changed, 94 insertions(+), 33 deletions(-) diff --git a/dist/js/tool.js b/dist/js/tool.js index 1fa5f6f..9d7ae03 100644 --- a/dist/js/tool.js +++ b/dist/js/tool.js @@ -2236,7 +2236,7 @@ exports = module.exports = __webpack_require__(1)(false); // module -exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* Scoped Styles */\n", ""]); +exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* Scoped Styles */\n", ""]); // exports @@ -2320,6 +2320,16 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// +// +// +// +// +// +// +// @@ -2328,21 +2338,28 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); components: { 'charges-pagination-links': __WEBPACK_IMPORTED_MODULE_0__ChargesPaginationLinks_vue___default.a }, - data: function data() { return { charges: {}, initialLoading: true, loading: false, hasMore: false, - page: 1 + page: 1, + statusClassList: { + 'succeeded': 'bg-success-light text-success-dark', + 'pending': 'bg-warning-light text-warning-dark', + 'failed': 'bg-danger-light text-danger-dark' + } }; }, - + computed: { + hasPrevious: function hasPrevious() { + return this.page > 1; + } + }, methods: { moment: moment, - listCharges: function listCharges(params) { var _this = this; @@ -2368,15 +2385,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); if (this.hasPrevious) { this.page--; } + }, + statusClass: function statusClass(status) { + return this.statusClassList[status]; } }, - - computed: { - hasPrevious: function hasPrevious() { - return this.page > 1; - } - }, - filters: { date: function date(_date) { return moment.unix(_date).format('YYYY/MM/DD h:mm:ss a'); @@ -2385,7 +2398,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); money: __WEBPACK_IMPORTED_MODULE_1__utils_moneyFormat__["a" /* default */] }, - created: function created() { this.listCharges(); } @@ -2657,7 +2669,44 @@ var render = function() { _vm._l(_vm.charges, function(charge) { return _c("tbody", [ _c("tr", [ - _c("td", [_vm._v(_vm._s(charge.id))]), + _c("td", [ + _vm._v( + "\n " + + _vm._s(charge.id) + + "\n " + ), + charge.refunded + ? _c("span", { staticClass: "text-70" }, [ + _c("span", { staticClass: "hidden sr-only" }, [ + _vm._v("Refunded") + ]), + _vm._v(" "), + _c( + "svg", + { + staticClass: "h-5 w-5 ml-3", + attrs: { + xmlns: "http://www.w3.org/2000/svg", + fill: "none", + viewBox: "0 0 24 24", + stroke: "currentColor" + } + }, + [ + _c("path", { + attrs: { + "stroke-linecap": "round", + "stroke-linejoin": "round", + "stroke-width": "2", + d: + "M16 15v-1a4 4 0 00-4-4H8m0 0l3 3m-3-3l3-3m9 14V5a2 2 0 00-2-2H6a2 2 0 00-2 2v16l4-2 4 2 4-2 4 2z" + } + }) + ] + ) + ]) + : _vm._e() + ]), _vm._v(" "), _c("td", [ _vm._v( @@ -2671,7 +2720,17 @@ var render = function() { _vm._v(_vm._s(_vm._f("date")(charge.created))) ]), _vm._v(" "), - _c("td", [_vm._v(_vm._s(charge.status))]), + _c("td", [ + _c( + "span", + { + staticClass: + "rounded-lg px-3 py-1 capitalize text-xs font-black", + class: _vm.statusClass(charge.status) + }, + [_vm._v(_vm._s(charge.status))] + ) + ]), _vm._v(" "), _c("td", [ _c( diff --git a/resources/js/components/ChargesTable.vue b/resources/js/components/ChargesTable.vue index 9c855ee..c10c7b0 100644 --- a/resources/js/components/ChargesTable.vue +++ b/resources/js/components/ChargesTable.vue @@ -38,16 +38,18 @@ {{ charge.id }} - - Refunded - + + + {{ charge.currency | money(charge.amount) }} {{ charge.created | date }} - {{ charge.status }} + + {{ charge.status }} + 1 } }, - methods: { moment: moment, - listCharges(params) { Nova.request().get('/nova-vendor/nova-stripe/stripe/charges', { params }) .then((response) => { @@ -107,7 +116,6 @@ export default { this.loading = false }) }, - nextPage() { this.loading = true @@ -115,7 +123,6 @@ export default { this.page++ }, - previousPage() { this.loading = true @@ -124,15 +131,11 @@ export default { if (this.hasPrevious) { this.page-- } - } - }, - - computed: { - hasPrevious() { - return this.page > 1 - } + }, + statusClass(status) { + return this.statusClassList[status]; + }, }, - filters: { date(date) { return moment.unix(date).format('YYYY/MM/DD h:mm:ss a') @@ -140,7 +143,6 @@ export default { money }, - created() { this.listCharges() }, From 49ba2f4cee79fb02fb05faf0cf18fd5ef227b285 Mon Sep 17 00:00:00 2001 From: faxblaster Date: Mon, 19 Jul 2021 16:50:18 -0400 Subject: [PATCH 3/4] add refunded status to pills --- dist/js/tool.js | 69 ++++++++---------------- resources/js/components/ChargesTable.vue | 9 +--- 2 files changed, 23 insertions(+), 55 deletions(-) diff --git a/dist/js/tool.js b/dist/js/tool.js index 9d7ae03..9ea223a 100644 --- a/dist/js/tool.js +++ b/dist/js/tool.js @@ -2236,7 +2236,7 @@ exports = module.exports = __webpack_require__(1)(false); // module -exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* Scoped Styles */\n", ""]); +exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* Scoped Styles */\n", ""]); // exports @@ -2325,11 +2325,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // -// -// -// -// -// @@ -2673,39 +2668,8 @@ var render = function() { _vm._v( "\n " + _vm._s(charge.id) + - "\n " - ), - charge.refunded - ? _c("span", { staticClass: "text-70" }, [ - _c("span", { staticClass: "hidden sr-only" }, [ - _vm._v("Refunded") - ]), - _vm._v(" "), - _c( - "svg", - { - staticClass: "h-5 w-5 ml-3", - attrs: { - xmlns: "http://www.w3.org/2000/svg", - fill: "none", - viewBox: "0 0 24 24", - stroke: "currentColor" - } - }, - [ - _c("path", { - attrs: { - "stroke-linecap": "round", - "stroke-linejoin": "round", - "stroke-width": "2", - d: - "M16 15v-1a4 4 0 00-4-4H8m0 0l3 3m-3-3l3-3m9 14V5a2 2 0 00-2-2H6a2 2 0 00-2 2v16l4-2 4 2 4-2 4 2z" - } - }) - ] - ) - ]) - : _vm._e() + "\n " + ) ]), _vm._v(" "), _c("td", [ @@ -2721,15 +2685,24 @@ var render = function() { ]), _vm._v(" "), _c("td", [ - _c( - "span", - { - staticClass: - "rounded-lg px-3 py-1 capitalize text-xs font-black", - class: _vm.statusClass(charge.status) - }, - [_vm._v(_vm._s(charge.status))] - ) + !charge.refunded + ? _c( + "span", + { + staticClass: + "rounded-lg px-3 py-1 capitalize text-xs font-black", + class: _vm.statusClass(charge.status) + }, + [_vm._v(_vm._s(charge.status))] + ) + : _c( + "span", + { + staticClass: + "rounded-lg px-3 py-1 capitalize text-xs font-black bg-40 text-80" + }, + [_vm._v("Refunded")] + ) ]), _vm._v(" "), _c("td", [ diff --git a/resources/js/components/ChargesTable.vue b/resources/js/components/ChargesTable.vue index c10c7b0..4c572c6 100644 --- a/resources/js/components/ChargesTable.vue +++ b/resources/js/components/ChargesTable.vue @@ -38,17 +38,12 @@ {{ charge.id }} - - - - - - {{ charge.currency | money(charge.amount) }} {{ charge.created | date }} - {{ charge.status }} + {{ charge.status }} + Refunded From 04b4a0cbbb745224ac8b00a0f41b8b6b348dc565 Mon Sep 17 00:00:00 2001 From: Alison Kirk Date: Mon, 26 Jul 2021 17:41:35 -0400 Subject: [PATCH 4/4] Update resources/js/components/ChargesTable.vue Co-authored-by: Matt Stauffer --- resources/js/components/ChargesTable.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/js/components/ChargesTable.vue b/resources/js/components/ChargesTable.vue index 4c572c6..cd4e60e 100644 --- a/resources/js/components/ChargesTable.vue +++ b/resources/js/components/ChargesTable.vue @@ -42,8 +42,7 @@ {{ charge.currency | money(charge.amount) }} {{ charge.created | date }} - {{ charge.status }} - Refunded + {{ charge.refunded ? 'Refunded' : charge.status }}