new code changes

src/js/ripe.js

@@ -965,8 +965,8 @@ ripe.Ripe.prototype._getQueryOptions = function(options) {
     var parts = options.parts === undefined ? this.parts : options.parts;
     var engraving = options.engraving === undefined ? this.engraving : options.engraving;
     var country = options.country === undefined ? this.country : options.country;
-    var flag = options.flag === undefined ? this.flag : options.flag;
     var currency = options.currency === undefined ? this.currency : options.currency;
+    var flag = options.flag === undefined ? this.flag : options.flag;
 
     if (brand !== undefined && brand !== null) {
         params.brand = brand;
@@ -992,14 +992,14 @@ ripe.Ripe.prototype._getQueryOptions = function(options) {
         params.country = country;
     }
 
-    if (flag !== undefined && flag !== null) {
-        params.flag = flag;
-    }
-
     if (currency !== undefined && currency !== null) {
         params.currency = currency;
     }
 
+    if (flag !== undefined && flag !== null) {
+        params.flag = flag;
+    }
+
     params.p = [];
 
     for (var part in parts) {

src/python/ripe_demo/static/js/ripe.js

@@ -435,8 +435,8 @@ ripe.Ripe.prototype.setOptions = function(options) {
     this.webUrl = this.options.webUrl || "https://sandbox.platforme.com/";
     this.parts = this.options.parts || {};
     this.country = this.options.country || null;
-    this.flag = this.options.flag || null;
     this.currency = this.options.currency || null;
+    this.flag = this.options.flag || null;
     this.format = this.options.format || "jpeg";
     this.backgroundColor = this.options.backgroundColor || "";
     this.noDefaults = this.options.noDefaults === undefined ? false : this.options.noDefaults;
@@ -965,8 +965,8 @@ ripe.Ripe.prototype._getQueryOptions = function(options) {
     var parts = options.parts === undefined ? this.parts : options.parts;
     var engraving = options.engraving === undefined ? this.engraving : options.engraving;
     var country = options.country === undefined ? this.country : options.country;
-    var flag = options.flag === undefined ? this.flag : options.flag;
     var currency = options.currency === undefined ? this.currency : options.currency;
+    var flag = options.flag === undefined ? this.flag : options.flag;
 
     if (brand !== undefined && brand !== null) {
         params.brand = brand;
@@ -992,14 +992,14 @@ ripe.Ripe.prototype._getQueryOptions = function(options) {
         params.country = country;
     }
 
-    if (flag !== undefined && flag !== null) {
-        params.flag = flag;
-    }
-
     if (currency !== undefined && currency !== null) {
         params.currency = currency;
     }
 
+    if (flag !== undefined && flag !== null) {
+        params.flag = flag;
+    }
+
     params.p = [];
 
     for (var part in parts) {

test/js/api.js

@@ -143,7 +143,7 @@ describe("RipeAPI", function() {
             );
             assert.strictEqual(result.params.country, "PT");
         });
-        
+
         it("should include flag in params", async () => {
             let result = null;