diff --git a/Jenkinsfile b/Jenkinsfile index cf73f02..1dc2fe1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=372']) { + withEnv(['NEXT_BUILD_NUMBER=373']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_kitting.ascx b/NKC_WF/WebUserControls/cmp_kitting.ascx index 858f083..fa3afeb 100644 --- a/NKC_WF/WebUserControls/cmp_kitting.ascx +++ b/NKC_WF/WebUserControls/cmp_kitting.ascx @@ -3,23 +3,14 @@ <%@ Register Src="~/WebUserControls/cmp_kittingCart.ascx" TagPrefix="uc1" TagName="cmp_kittingCart" %>
-

<%: traduci("BinList") %>

-
-
-
- -
+

<%: traduci("BinList") %>

+
+
-
-

<%: traduci("CartList") %>

-
-
-
- -
+

<%: traduci("CartList") %>

+
+
-
-
- +
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx b/NKC_WF/WebUserControls/cmp_kittingBin.ascx index 6113452..a80051a 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx @@ -1,59 +1,60 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kittingBin.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kittingBin" %> -
- - -
- -
-
-
- - - - - - - - + + +
+ +
+
+
+ + + + + + + +
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingCart.ascx b/NKC_WF/WebUserControls/cmp_kittingCart.ascx index db93d66..81d296f 100644 --- a/NKC_WF/WebUserControls/cmp_kittingCart.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingCart.ascx @@ -3,74 +3,74 @@
-
+
@@ -78,4 +78,4 @@ -
+
\ No newline at end of file diff --git a/NKC_WF/site/Kitting.aspx b/NKC_WF/site/Kitting.aspx index 5b39a2d..516eafc 100644 --- a/NKC_WF/site/Kitting.aspx +++ b/NKC_WF/site/Kitting.aspx @@ -6,11 +6,11 @@ - -
- + +
+
- + \ No newline at end of file