Merge pull request #666 from Crown-Commercial-Service/development

DEV to UAT

Author: Chee-Ng

public/search-api/frameworks.php

@@ -122,6 +122,7 @@ function get_upcoming_deals()
     $underwayFrameworks = [];
     $awardedFrameworks = [];
     $dynamicFrameworks = [];
+    $marketFrameworks = [];
 
 
     foreach ($frameworks as $framework) {
@@ -154,6 +155,11 @@ function get_upcoming_deals()
             if ($framework->getStatus() === 'Live' && $framework->getTerms() === 'DPS') {
                 $dynamicFrameworks[] = $framework->toArray();
             }
+
+            if ($framework->getStatus() === 'Live' && $framework->getRegulationType() === 'Dynamic Market') {
+                $marketFrameworks[] = $framework->toArray();
+            }
+
         }
     }
 
@@ -163,7 +169,8 @@ function get_upcoming_deals()
         $plannedFrameworks,
         $underwayFrameworks,
         $awardedFrameworks,
-        $dynamicFrameworks
+        $dynamicFrameworks,
+        $marketFrameworks
     );
 
     return $upcomingAgreements;

public/wp-content/plugins/ccs-salesforce/includes/wp-rest-api/CustomUpcomingDealsApi.php

@@ -84,13 +84,22 @@ public function get_upcoming_deals()
             endwhile;
         endif;
 
+        $table5 = [];
+        if (have_rows('table_5', 'option')):
+            while (have_rows('table_5', 'option')): the_row();
+                $table5['title'] = get_sub_field('title');
+                $table5['caption'] = get_sub_field('caption');
+            endwhile;
+        endif;
+
         return [
           'upcomingDealsInfo'  => $upcomingDealsInfo,
           'table_0' => $table0,
           'table_1' => $table1,
           'table_2' => $table2,
           'table_3' => $table3,
           'table_4' => $table4,
+          'table_5' => $table5,
         ];
     }
 

public/wp-content/plugins/publishpress/CONTRIBUTING.md

@@ -2,7 +2,7 @@
  * @package PublishPress
  * @author PublishPress
  *
- * Copyright (c) 2018 PublishPress
+ * Copyright (c) 2022 PublishPress
  *
  * ------------------------------------------------------------------------------
  * Based on Edit Flow
@@ -147,25 +147,6 @@
     border-style: solid;
 }
 
-.pressshack-admin-wrapper .button-primary {
-    background-color: #FFB300;
-    border-color: #C58C07;
-    color: #754D26;
-}
-
-.pressshack-admin-wrapper .button-primary:hover,
-.pressshack-admin-wrapper .button-primary:active,
-.pressshack-admin-wrapper .button-primary:focus {
-    background-color: #F3AC04;
-    border-color: #C58C07;
-    color: #333;
-    outline: none;
-    box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
-    -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
-    -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
-    -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
 .pressshack-admin-wrapper .button:not(.notice-dismiss):hover,
 .pressshack-admin-wrapper .button:not(.notice-dismiss):active,
 .pressshack-admin-wrapper .button:not(.notice-dismiss):focus {