Rodney Elpidio Enciso Arias 6 éve
szülő
commit
6fe507f49d
3 módosított fájl, 17 hozzáadás és 22 törlés
  1. 2 1
      static/src/js/models.js
  2. 11 13
      static/src/js/screens.js
  3. 4 8
      static/src/xml/pos.xml

+ 2 - 1
static/src/js/models.js

@@ -90,7 +90,8 @@ function ep_pos_models(instance,module)
         },
     });
     
-    module.Order = module.Order.extend({
+    module.Order = module.Order.extend(
+	{
 		initialize: function(attributes)
 		{
             Backbone.Model.prototype.initialize.apply(this, arguments);

+ 11 - 13
static/src/js/screens.js

@@ -63,14 +63,13 @@ function ep_pos_screens(instance,module)
 			var decimals=currentOrder.foreign_currency.decimals;
 			
 			if (self.pos.config.display_conversion)
-				// '1 '+self.pos.currency.name+' = '+
-				self.$('#conversion_rate').html('Cambio de ' + name + ' = ' + rate_silent + ' '); 
-						
+				self.$('#conversion_rate').html('1 '+self.pos.currency.name+' = '+
+						rate_silent + ' ' + name);
 			
-			self.$('#currency_value_label').html('Total en '+ name + ':');
-			self.$('#foreign_input_label').html('Pagado en '+ name + ':');
+			self.$('#currency_value_label').html('Total in '+name + ':');
+			self.$('#foreign_input_label').html('Paid in '+name + ':');
 			self.$('#currency_value').html(self.format_foreign(currentOrder.currency_total,currentOrder.foreign_currency));
-			self.$('#foreign_change_label').html('Cambio en ' + name + ':');
+			self.$('#foreign_change_label').html('Change in ' + name + ':');
 			self.$('#foreign_change_value').html(self.format_foreign(0,currentOrder.foreign_currency));
 		},
 		
@@ -133,9 +132,9 @@ function ep_pos_screens(instance,module)
 		            self.$('#curr_input').trigger('keyup');
 	        	}
 	            var foreign_decimals=currentOrder.foreign_currency.decimals;
+	            
 	            var foreign_currency_rate=currentOrder.foreign_currency.rate_silent;
-	            // Modificacion
-				currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()/foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
+				currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()*foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
 	            
 	            self.set_foreign_values();
 	            if (currentOrder.currency_paid==0)
@@ -155,7 +154,7 @@ function ep_pos_screens(instance,module)
 	                    });
 						return false;
 					}
-					converted_value=round_di(this.value*currentOrder.foreign_currency.rate_silent,self.pos.currency.decimals).toFixed(self.pos.currency.decimals);
+					converted_value=round_di(this.value/currentOrder.foreign_currency.rate_silent,self.pos.currency.decimals).toFixed(self.pos.currency.decimals);
 					line.set_amount(converted_value);
 					self.$('.paymentline.selected input').val(converted_value);
 					
@@ -172,7 +171,7 @@ function ep_pos_screens(instance,module)
 					
 					var foreign_currency_rate=currentOrder.foreign_currency.rate_silent;
 
-					currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()/foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
+					currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()*foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
 					self.$('#curr_input').val(0);
 					
 					var line = currentOrder.selected_paymentline;
@@ -236,9 +235,8 @@ function ep_pos_screens(instance,module)
 				
 				var fc=currentOrder.foreign_currency;
 				var rate=fc.rate_silent;
-				var decimals=fc.decimals;
-				// Modificacion
-				var converted_value=round_di(change/rate,decimals).toFixed(decimals);
+				var decimals=fc.decimals
+				var converted_value=round_di(change*rate,decimals).toFixed(decimals);
 				
 				currentOrder.currency_change=converted_value;
 				self.$('#foreign_change_value').html(self.format_foreign(converted_value,fc));

+ 4 - 8
static/src/xml/pos.xml

@@ -12,7 +12,7 @@
 					    </label>
 					</div>
 					<div style="padding:5px;text-align:right !important;float:left">
-						<span> Moneda Extranjera</span>
+						<span>Foreign Currency</span>
 					</div>
 				</div>
 				<br/><br/>
@@ -20,7 +20,7 @@
 					
 					<div class="foreign_infoline">
 						<label class="left-block" id="currency_selection_label" 
-									for="currency_selection">Moneda: </label>
+									for="currency_selection">Currency:</label>
 						
 						<t t-set="selected_curr" t-value="widget.get_currency_selection()" />
 						<select style="height:30px;width:50%;" 
@@ -50,13 +50,9 @@
 					</div>
 					<div class="foreign_infoline">
 						<span id="foreign_input_label" class="left-block"></span>
-						<input placeholder="Ingresar Valor" 
+						<input placeholder="Enter Amount" 
 								class="paymentline-input-foreign right-block" 
-								id="curr_input" type="number" step="0.01" pattern="!/^([0-9])*$/" min="0.0"></input>
-								<!-- Expresion regular orginal -->
-								<!-- [0-9]+([\.][0-9]+)? -->
-								<!-- Nueva expresion regular -->
-								<!-- !/^([0-9])*$/ -->
+								id="curr_input" type="number" step="0.01" pattern="[0-9]+([\.][0-9]+)?" min="0.0"></input>
 					</div>
 				</div>
 				<br/>