This commit is contained in:
Dennis Smink
2020-09-28 11:11:37 +02:00
parent 0d0e2732b5
commit cfd0c3cbe9
6 changed files with 84 additions and 7 deletions

View File

@@ -14,7 +14,20 @@ class ProfileBillingController extends Controller
/* @var $user User */
$user = auth()->user();
$packages = Package::whereNotNull('plan_id')->get();
$packages = Package::query()
->where(function ($query) {
return $query
->where('price_monthly', '>', 0)
->whereNotNull('plan_id');
})
->get()
->transform(function (Package $package) {
$symbol = $package->currency === Package::CURRENCY_EURO ? '€' : '$';
$package->price_monthly = $symbol . number_format($package->price_monthly, 2, ',', '.');
return $package;
});
$intent = $user->createSetupIntent();

22
public/js/2.js vendored
View File

@@ -71,6 +71,11 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
//
//
//
//
@@ -122,6 +127,16 @@ var defaultClasses = 'w-full border-medium-emphasis text-body h-10 px-2 border r
required: false,
"default": false,
type: Boolean
},
loading: {
type: Boolean,
required: false,
"default": false
},
disabled: {
type: Boolean,
required: false,
"default": false
}
},
components: {
@@ -343,11 +358,16 @@ var render = function() {
: _vm._e(),
_vm._v(" "),
_c("input", {
class: [_vm.defaultClasses],
class: [
_vm.defaultClasses,
_vm.disabled || _vm.loading ? "opacity-50" : "",
_vm.loading ? "cursor-wait" : ""
],
attrs: {
id: _vm.id,
type: _vm.type,
required: _vm.required,
disabled: _vm.loading || _vm.disabled,
placeholder: _vm.placeholder
},
domProps: { value: _vm.value },

16
public/js/44.js vendored
View File

@@ -109,6 +109,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
//
//
//
//
@@ -206,6 +207,19 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
cardElement.mount('#card-element');
this.cardElement = cardElement;
},
watch: {
sending: function sending(value) {
if (value) {
this.cardElement.update({
disabled: true
});
} else {
this.cardElement.update({
disabled: false
});
}
}
},
methods: {
useNotification: _hooks_notification__WEBPACK_IMPORTED_MODULE_28__["useNotification"],
updateBilling: function updateBilling() {
@@ -487,6 +501,7 @@ var render = function() {
_c("form-input", {
attrs: {
errors: _vm.$page.errors.card_holder_name,
disabled: _vm.sending,
id: "card-holder-name",
label: "Card Holder Name"
},
@@ -511,7 +526,6 @@ var render = function() {
_vm._v(" "),
_c("div", {
staticClass: "form-input",
staticStyle: { width: "100%" },
attrs: { id: "card-element" }
})
]),

2
public/js/app.js vendored
View File

@@ -43,7 +43,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
/******/ return __webpack_require__.p + "js/" + ({}[chunkId]||chunkId) + ".js?id=" + {"0":"0dcde053981f92959e59","1":"1f54da123eda919cce74","2":"e3b2b0aba5a1f9a18fe2","3":"a0f4c2f49863abbfe7f1","4":"b45cf4f45862750fc0ec","5":"fbfbcf45610d060d921e","6":"73fc0264b5cc06f5bd55","7":"140acb8c38018bb7c822","8":"59e78c3d75a8476bd5c9","9":"0e2b6a5949f3c9112538","10":"f9ed085fc6cd1aba8502","11":"0f8981f56a35c2907e52","12":"850061072347e1a63a1b","13":"130e082812565df57bb9","14":"7786a4d7d85cd912d1bb","15":"fde17a1d596d6578fe61","16":"ec73f93b8d2c978c776b","17":"7935846db69c83fa06e9","18":"eb279f54aaced41cea0d","19":"69e2b8e5f7ceaf531d8f","20":"56c907d75bd74a171a1e","21":"293d9274645861582e83","22":"f86cd3fbd99cae6840a1","23":"69b50c09720c1e425846","24":"6528b4d30e41a6fa0079","25":"c087891e0174c14e6712","26":"2448e94386f76b71cbc5","27":"f64fcf99c66c3ded843a","28":"499193813923aa10e5d0","29":"e55b29dabbe4b5d967ec","30":"b07561cdf33321646d5c","31":"3a07c5c14e5931d31248","32":"effd92a8cb5b1bd3574a","33":"6bddf34d99f3970e6369","34":"22e5b7718494db21b419","35":"f06fb885533092af3f1c","36":"9ec5b34a8694525e9d6c","37":"1ea697ec75189844ee8e","38":"fb5c0c3425e2fadee1ac","39":"2f7ee059f5ec1516acf8","40":"6f1ccb20825928a8000e","41":"f914087b14e94042d448","42":"991540862ca387cd2cef","43":"570bfae54343c4146297","44":"7b3d86b274fb701bc880","45":"bc9905a168fcf98972f8","46":"903d3f59efebc94f0127","47":"9ab7f36e89476ccdde61","48":"be35a432781c0dd50ffb","49":"fb12139e13838330d7d7","50":"3182cb7241b3b4928780","51":"044af61dc1b992e484da","52":"a38120293ec348f769ac","53":"67f8f3da1f9e683ed95a","54":"4990ac6ae184ca917408","55":"d4db22f438e60159302a","56":"63e95ff6894657529026","57":"9ed351e93f9380d778f9","58":"4fc15eab9b2584cbd39a","59":"b1b47409e6a708c545f9","60":"5c804a0bdbc1689f9e16","61":"f317e1cfb4fdc62653b6","62":"91b515a9efa16b62a482","63":"b80411b33eac32e92724","64":"a9a7a17de7d5db824f16","65":"bf60e1282539f8d6d311","66":"df02292237985d2bbad4","67":"ec4c56fa7e2f86ba9542","68":"d76162b63ba6711f9832","69":"dd0116835bd413f8fb6e","70":"8cb98947cbde261be98d","71":"1e5583ee6f420e7b5266","72":"5d974639a248789c2acc","73":"fba48eaf9d4793897a88"}[chunkId] + ""
/******/ return __webpack_require__.p + "js/" + ({}[chunkId]||chunkId) + ".js?id=" + {"0":"0dcde053981f92959e59","1":"1f54da123eda919cce74","2":"d2a49802291d427ca7c8","3":"a0f4c2f49863abbfe7f1","4":"b45cf4f45862750fc0ec","5":"fbfbcf45610d060d921e","6":"73fc0264b5cc06f5bd55","7":"140acb8c38018bb7c822","8":"59e78c3d75a8476bd5c9","9":"0e2b6a5949f3c9112538","10":"f9ed085fc6cd1aba8502","11":"0f8981f56a35c2907e52","12":"850061072347e1a63a1b","13":"130e082812565df57bb9","14":"7786a4d7d85cd912d1bb","15":"fde17a1d596d6578fe61","16":"ec73f93b8d2c978c776b","17":"7935846db69c83fa06e9","18":"eb279f54aaced41cea0d","19":"69e2b8e5f7ceaf531d8f","20":"56c907d75bd74a171a1e","21":"293d9274645861582e83","22":"f86cd3fbd99cae6840a1","23":"69b50c09720c1e425846","24":"6528b4d30e41a6fa0079","25":"c087891e0174c14e6712","26":"2448e94386f76b71cbc5","27":"f64fcf99c66c3ded843a","28":"499193813923aa10e5d0","29":"e55b29dabbe4b5d967ec","30":"b07561cdf33321646d5c","31":"3a07c5c14e5931d31248","32":"effd92a8cb5b1bd3574a","33":"6bddf34d99f3970e6369","34":"22e5b7718494db21b419","35":"f06fb885533092af3f1c","36":"9ec5b34a8694525e9d6c","37":"1ea697ec75189844ee8e","38":"fb5c0c3425e2fadee1ac","39":"2f7ee059f5ec1516acf8","40":"6f1ccb20825928a8000e","41":"f914087b14e94042d448","42":"991540862ca387cd2cef","43":"570bfae54343c4146297","44":"7249338b19cba08a216f","45":"bc9905a168fcf98972f8","46":"903d3f59efebc94f0127","47":"9ab7f36e89476ccdde61","48":"be35a432781c0dd50ffb","49":"fb12139e13838330d7d7","50":"3182cb7241b3b4928780","51":"044af61dc1b992e484da","52":"a38120293ec348f769ac","53":"67f8f3da1f9e683ed95a","54":"4990ac6ae184ca917408","55":"d4db22f438e60159302a","56":"63e95ff6894657529026","57":"9ed351e93f9380d778f9","58":"4fc15eab9b2584cbd39a","59":"b1b47409e6a708c545f9","60":"5c804a0bdbc1689f9e16","61":"f317e1cfb4fdc62653b6","62":"91b515a9efa16b62a482","63":"b80411b33eac32e92724","64":"a9a7a17de7d5db824f16","65":"bf60e1282539f8d6d311","66":"df02292237985d2bbad4","67":"ec4c56fa7e2f86ba9542","68":"d76162b63ba6711f9832","69":"dd0116835bd413f8fb6e","70":"8cb98947cbde261be98d","71":"1e5583ee6f420e7b5266","72":"5d974639a248789c2acc","73":"fba48eaf9d4793897a88"}[chunkId] + ""
/******/ }
/******/
/******/ // The require function

View File

@@ -14,12 +14,13 @@
</p>
<form-input v-model="cardHolderName"
:errors="$page.errors.card_holder_name"
:disabled="sending"
id="card-holder-name"
label="Card Holder Name"/>
<div class="pb-4 w-full">
<label class="form-label" for="card-element">Card details</label>
<div id="card-element" class="form-input" style="width: 100%"></div>
<div id="card-element" class="form-input"></div>
</div>
<Button :data-secret="clientSecret" id="card-button" :loading="sending"
@@ -175,6 +176,20 @@
this.cardElement = cardElement;
},
watch: {
sending: function(value){
if(value){
this.cardElement.update({
disabled: true
});
}else {
this.cardElement.update({
disabled: false
});
}
}
},
methods: {
useNotification,

View File

@@ -13,11 +13,16 @@
</button>
<input :id="id"
:class="[defaultClasses]"
:class="[
defaultClasses,
disabled || loading ? 'opacity-50' : '',
loading ? 'cursor-wait' : '',
]"
:type="type"
:required="required"
:value="value"
@input="updateValue($event.target.value)"
:disabled="loading || disabled"
:placeholder="placeholder" />
<ErrorText v-if="errors">{{ errors[0] }}</ErrorText>
<HelperText v-if="helperText && !errors">{{ helperText }}</HelperText>
@@ -76,7 +81,17 @@ export default {
required: false,
default: false,
type: Boolean
}
},
loading: {
type: Boolean,
required: false,
default: false,
},
disabled: {
type: Boolean,
required: false,
default: false,
},
},
components: {