|
@@ -55,7 +55,6 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
|
|
|
public static function previewSave($data)
|
|
|
{
|
|
|
-
|
|
|
$distInfo = DistAdminDistributor::getInfo();
|
|
|
$distId = $distInfo->id;
|
|
|
$appearanceId = $distInfo->appearance_id;
|
|
@@ -68,7 +67,6 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
|
|
|
$oldContent = self::contentChange($template->content,$template->template_code);
|
|
|
$newContent = self::contentReplace($oldContent,$elements);
|
|
|
-
|
|
|
|
|
|
$template->content = $newContent;
|
|
|
$template->updated_at = Carbon::now();
|
|
@@ -99,6 +97,7 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
},
|
|
|
$content
|
|
|
);
|
|
|
+
|
|
|
|
|
|
$content = preg_replace_callback(
|
|
|
'/<([a-zA-Z0-9]+)[^>]*mtb_id="' . preg_quote($mtbId, '/') . '"[^>]*>/s',
|
|
@@ -108,7 +107,6 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
},
|
|
|
$content
|
|
|
);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
return $content;
|
|
@@ -133,7 +131,7 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
$outHtml = preg_replace($pattern, $replacement, $outHtml, 1);
|
|
|
|
|
|
|
|
|
- $outHtml = preg_replace('/mtb_id="[^"]*"/', '', $outHtml);
|
|
|
+ $outHtml = preg_replace('/\s*mtb_id="[^"]*"/', '', $outHtml);
|
|
|
$result[] = [
|
|
|
'mtb_id' => $match[3],
|
|
|
'outHtml' => $outHtml,
|
|
@@ -146,7 +144,7 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
foreach ($matches as $match) {
|
|
|
|
|
|
$outHtml = $match[0];
|
|
|
- $outHtml = preg_replace('/mtb_id="[^"]*"/', '', $outHtml);
|
|
|
+ $outHtml = preg_replace('/\s*mtb_id="[^"]*"/', '', $outHtml);
|
|
|
$result[] = [
|
|
|
'mtb_id' => $match[2],
|
|
|
'outHtml' => $outHtml,
|
|
@@ -154,6 +152,7 @@ class DistAppearanceTemplate extends EloquentRepository
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
$result = array_reduce($result, function ($carry, $item) {
|
|
|
|
|
|
$prefix = explode('_', $item['mtb_id'])[0];
|