mirror of
				https://github.com/crater-invoice/crater.git
				synced 2025-10-31 05:31:10 -04:00 
			
		
		
		
	Adjust money format to respect swap_currency_symbol
This commit is contained in:
		| @ -23,7 +23,7 @@ export default { | ||||
|  | ||||
|     amount = amount / 100 | ||||
|  | ||||
|     let { precision, decimal_separator, thousand_separator, symbol } = currency | ||||
|     let { precision, decimal_separator, thousand_separator, symbol, swap_currency_symbol } = currency | ||||
|  | ||||
|     try { | ||||
|       precision = Math.abs(precision) | ||||
| @ -37,19 +37,14 @@ export default { | ||||
|       let j = i.length > 3 ? i.length % 3 : 0 | ||||
|  | ||||
|       let moneySymbol = `<span style="font-family: sans-serif">${symbol}</span>` | ||||
|       let thousandText = (j ? i.substr(0, j) + thousand_separator : '') | ||||
|       let amountText = i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator) | ||||
|       let precisionText = (precision ? decimal_separator + Math.abs(amount - i).toFixed(precision).slice(2) : ''); | ||||
|       let combinedAmountText = negativeSign + thousandText + amountText + precisionText        | ||||
|  | ||||
|       return ( | ||||
|         moneySymbol + | ||||
|         ' ' + | ||||
|         negativeSign + | ||||
|         (j ? i.substr(0, j) + thousand_separator : '') + | ||||
|         i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator) + | ||||
|         (precision | ||||
|           ? decimal_separator + | ||||
|             Math.abs(amount - i) | ||||
|               .toFixed(precision) | ||||
|               .slice(2) | ||||
|           : '') | ||||
|       return (swap_currency_symbol  | ||||
|         ? combinedAmountText + ' ' + moneySymbol  | ||||
|         : moneySymbol + ' ' + combinedAmountText | ||||
|       ) | ||||
|     } catch (e) { | ||||
|       console.log(e) | ||||
| @ -68,7 +63,7 @@ export default { | ||||
|  | ||||
|     amount = amount / 100 | ||||
|  | ||||
|     let { precision, decimal_separator, thousand_separator, symbol } = currency | ||||
|     let { precision, decimal_separator, thousand_separator, symbol, swap_currency_symbol } = currency | ||||
|  | ||||
|     try { | ||||
|       precision = Math.abs(precision) | ||||
| @ -82,19 +77,14 @@ export default { | ||||
|       let j = i.length > 3 ? i.length % 3 : 0 | ||||
|  | ||||
|       let moneySymbol = `${symbol}` | ||||
|       let thousandText = (j ? i.substr(0, j) + thousand_separator : '') | ||||
|       let amountText = i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator) | ||||
|       let precisionText = (precision ? decimal_separator + Math.abs(amount - i).toFixed(precision).slice(2) : ''); | ||||
|       let combinedAmountText = negativeSign + thousandText + amountText + precisionText        | ||||
|  | ||||
|       return ( | ||||
|         moneySymbol + | ||||
|         ' ' + | ||||
|         negativeSign + | ||||
|         (j ? i.substr(0, j) + thousand_separator : '') + | ||||
|         i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator) + | ||||
|         (precision | ||||
|           ? decimal_separator + | ||||
|             Math.abs(amount - i) | ||||
|               .toFixed(precision) | ||||
|               .slice(2) | ||||
|           : '') | ||||
|       return (swap_currency_symbol  | ||||
|         ? combinedAmountText + ' ' + moneySymbol  | ||||
|         : moneySymbol + ' ' + combinedAmountText | ||||
|       ) | ||||
|     } catch (e) { | ||||
|       console.log(e) | ||||
|  | ||||
		Reference in New Issue
	
	Block a user