Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

"same amount" checkbox fix

Browse source
This commit is contained in:
wildkif 2019-05-27 17:00:24 +03:00
parent 0b88f1a152
commit d69ac68bca
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/qt-daemon/html/main.js
View file

@ -5148,7 +5148,7 @@ var PurchaseComponent = /** @class */ (function () {
return null;
}]),
amount: new _angular_forms__WEBPACK_IMPORTED_MODULE_2__["FormControl"](null, [_angular_forms__WEBPACK_IMPORTED_MODULE_2__["Validators"].required, function (g) {
if (parseInt(g.value, 10) === 0) {
if (parseFloat(g.value) === 0) {
return { 'amount_zero': true };
}
return null;
@ -5291,11 +5291,9 @@ var PurchaseComponent = /** @class */ (function () {
PurchaseComponent.prototype.createPurchase = function () {
var _this = this;
if (this.purchaseForm.valid) {
var sellerDeposit_1 = this.purchaseForm.get('sameAmount').value ? this.purchaseForm.get('amount').value : this.purchaseForm.get('sellerDeposit').value;
if (this.purchaseForm.get('seller').value.indexOf('@') !== 0) {
if (this.purchaseForm.get('sameAmount').value) {
this.purchaseForm.get('sellerDeposit').setValue(this.purchaseForm.get('amount').value);
}
this.backend.createProposal(this.variablesService.currentWallet.wallet_id, this.purchaseForm.get('description').value, this.purchaseForm.get('comment').value, this.variablesService.currentWallet.address, this.purchaseForm.get('seller').value, this.purchaseForm.get('amount').value, this.purchaseForm.get('yourDeposit').value, this.purchaseForm.get('sellerDeposit').value, this.purchaseForm.get('time').value, this.purchaseForm.get('payment').value, function (create_status) {
this.backend.createProposal(this.variablesService.currentWallet.wallet_id, this.purchaseForm.get('description').value, this.purchaseForm.get('comment').value, this.variablesService.currentWallet.address, this.purchaseForm.get('seller').value, this.purchaseForm.get('amount').value, this.purchaseForm.get('yourDeposit').value, sellerDeposit_1, this.purchaseForm.get('time').value, this.purchaseForm.get('payment').value, function (create_status) {
if (create_status) {
_this.back();
}
@ -5310,7 +5308,7 @@ var PurchaseComponent = /** @class */ (function () {
});
}
else {
_this.backend.createProposal(_this.variablesService.currentWallet.wallet_id, _this.purchaseForm.get('description').value, _this.purchaseForm.get('comment').value, _this.variablesService.currentWallet.address, alias_data.address, _this.purchaseForm.get('amount').value, _this.purchaseForm.get('yourDeposit').value, _this.purchaseForm.get('sellerDeposit').value, _this.purchaseForm.get('time').value, _this.purchaseForm.get('payment').value, function (create_status) {
_this.backend.createProposal(_this.variablesService.currentWallet.wallet_id, _this.purchaseForm.get('description').value, _this.purchaseForm.get('comment').value, _this.variablesService.currentWallet.address, alias_data.address, _this.purchaseForm.get('amount').value, _this.purchaseForm.get('yourDeposit').value, sellerDeposit_1, _this.purchaseForm.get('time').value, _this.purchaseForm.get('payment').value, function (create_status) {
if (create_status) {
_this.back();
}

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

10
src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.ts
View file

@ -83,7 +83,7 @@ export class PurchaseComponent implements OnInit, OnDestroy {
return null;
}]),
amount: new FormControl(null, [Validators.required, (g: FormControl) => {
if (parseInt(g.value, 10) === 0) {
if (parseFloat(g.value) === 0) {
return {'amount_zero': true};
}
return null;
@ -241,10 +241,8 @@ export class PurchaseComponent implements OnInit, OnDestroy {
createPurchase() {
if (this.purchaseForm.valid) {
const sellerDeposit = this.purchaseForm.get('sameAmount').value ? this.purchaseForm.get('amount').value : this.purchaseForm.get('sellerDeposit').value;
if (this.purchaseForm.get('seller').value.indexOf('@') !== 0) {
if (this.purchaseForm.get('sameAmount').value) {
this.purchaseForm.get('sellerDeposit').setValue(this.purchaseForm.get('amount').value);
}
this.backend.createProposal(
this.variablesService.currentWallet.wallet_id,
this.purchaseForm.get('description').value,
@ -253,7 +251,7 @@ export class PurchaseComponent implements OnInit, OnDestroy {
this.purchaseForm.get('seller').value,
this.purchaseForm.get('amount').value,
this.purchaseForm.get('yourDeposit').value,
this.purchaseForm.get('sellerDeposit').value,
sellerDeposit,
this.purchaseForm.get('time').value,
this.purchaseForm.get('payment').value,
(create_status) => {
@ -277,7 +275,7 @@ export class PurchaseComponent implements OnInit, OnDestroy {
alias_data.address,
this.purchaseForm.get('amount').value,
this.purchaseForm.get('yourDeposit').value,
this.purchaseForm.get('sellerDeposit').value,
sellerDeposit,
this.purchaseForm.get('time').value,
this.purchaseForm.get('payment').value,
(create_status) => {