diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 32244a0ee..b48916faf 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -7,6 +7,7 @@ - fixed #10633: GET requests in Operation/User require valid CSRF token. - fixed #10621: ThingRecord needs an Asset Icon - fixed #10638: Paste from Admin Bar broken + - fixed per-field prices in ThingyRecord 7.7.14 - fixed #10606: shelf selector diff --git a/docs/upgrades/upgrade_7.7.13-7.7.14.pl b/docs/upgrades/upgrade_7.7.13-7.7.14.pl index 3eb50425f..b9dc856cb 100644 --- a/docs/upgrades/upgrade_7.7.13-7.7.14.pl +++ b/docs/upgrades/upgrade_7.7.13-7.7.14.pl @@ -27,8 +27,6 @@ use WebGUI::Asset; my $toVersion = '7.7.14'; my $quiet; # this line required -addFieldPriceToThingyRecord( $session ); - my $session = start(); # this line required # upgrade functions go here @@ -46,21 +44,6 @@ finish($session); # this line required #} -#---------------------------------------------------------------------------- -# Add the field price storage to ThingyRecord -sub addFieldPriceToThingyRecord { - my $session = shift; - print "\tAdd field prices to ThingyRecord... " unless $quiet; - - $session->db->write( - "ALTER TABLE ThingyRecord ADD COLUMN fieldPrice LONGTEXT", - ); - - print "DONE!\n" unless $quiet; -} - - - # -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- #---------------------------------------------------------------------------- diff --git a/docs/upgrades/upgrade_7.7.14-7.7.15.pl b/docs/upgrades/upgrade_7.7.14-7.7.15.pl index c3e235f43..171758b25 100644 --- a/docs/upgrades/upgrade_7.7.14-7.7.15.pl +++ b/docs/upgrades/upgrade_7.7.14-7.7.15.pl @@ -32,6 +32,7 @@ my $session = start(); # this line required # upgrade functions go here replacePayPalDriver($session); +addFieldPriceToThingyRecord( $session ); finish($session); # this line required @@ -45,6 +46,20 @@ finish($session); # this line required # print "DONE!\n" unless $quiet; #} + +#---------------------------------------------------------------------------- +# Add the field price storage to ThingyRecord +sub addFieldPriceToThingyRecord { + my $session = shift; + print "\tAdd field prices to ThingyRecord... " unless $quiet; + + $session->db->write( + "ALTER TABLE ThingyRecord ADD COLUMN fieldPrice LONGTEXT", + ); + + print "DONE!\n" unless $quiet; +} + sub replacePayPalDriver { my $session = shift; my $config = $session->config;