Skip to content

DEV to UAT #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chee-Ng merged 3 commits into from
Aug 19, 2025
Merged

DEV to UAT #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
661dd57
added live dynamic market framework to api
Chee-Ng Aug 14, 2025
dcfaf7c
Merge pull request #664 from Crown-Commercial-Service/WEB-3049-websit…
Chee-Ng Aug 15, 2025
9737d61
updated PublishPress to PublishPress planner
Chee-Ng Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 8 additions & 1 deletion public/search-api/frameworks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ function get_upcoming_deals()
$underwayFrameworks = [];
$awardedFrameworks = [];
$dynamicFrameworks = [];
$marketFrameworks = [];


foreach ($frameworks as $framework) {
Expand Down Expand Up @@ -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();
}

}
}

Expand All @@ -163,7 +169,8 @@ function get_upcoming_deals()
$plannedFrameworks,
$underwayFrameworks,
$awardedFrameworks,
$dynamicFrameworks
$dynamicFrameworks,
$marketFrameworks
);

return $upcomingAgreements;
Expand Down
9 changes: 9 additions & 0 deletions public/wp-content/plugins/ccs-salesforce/includes/wp-rest-api/CustomUpcomingDealsApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
];
}

Expand Down
46 changes: 0 additions & 46 deletions public/wp-content/plugins/publishpress/CONTRIBUTING.md
View file
Open in desktop

This file was deleted.

21 changes: 1 addition & 20 deletions public/wp-content/plugins/publishpress/common/css/pressshack-admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package PublishPress
* @author PublishPress
*
* Copyright (c) 2018 PublishPress
* Copyright (c) 2022 PublishPress
*
* ------------------------------------------------------------------------------
* Based on Edit Flow
Expand Down Expand Up @@ -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 {
Expand Down
Loading
Loading