fix : new ui changes

2025-07-21 15:06:19 +03:30
parent e2300293a7
commit 99503a2d72
12 changed files with 66 additions and 29 deletions
--- a/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart
+++ b/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart
@@ -74,6 +74,7 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
        Expanded(
          flex: 3,
          child: Column(
+            spacing: 3,
            mainAxisAlignment: MainAxisAlignment.center,
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
@@ -98,7 +99,11 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
                ],
              ),

-              SizedBox(height: 2),
+              Text(
+                item.steward?.guildsName ?? 'N/A',
+                textAlign: TextAlign.start,
+                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+              ),
            ],
          ),
        ),
@@ -186,7 +191,7 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
          ),

          buildRow(
-            title: 'نام و نام خانوادگی فروشنده',
+            title: 'مشخصات فروشنده',
            value: item.steward?.user?.fullname ?? 'N/A',
          ),
          buildRow(
@@ -194,7 +199,10 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
            value: item.steward?.user?.mobile ?? 'N/A',
            valueStyle: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
          ),
-
+          buildRow(
+            title: 'نوع تخصیص',
+            value: item.allocationType?.faAllocationType ?? 'N/A',
+          ),
          buildRow(title: 'محصول', value: item.product?.name ?? 'N/A'),
          buildRow(
            title: 'وزن خریداری شده',
--- a/packages/chicken/lib/presentation/pages/buy_in_province_waiting/view.dart
+++ b/packages/chicken/lib/presentation/pages/buy_in_province_waiting/view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart';
+import 'package:rasadyar_chicken/presentation/utils/string_utils.dart';
 import 'package:rasadyar_chicken/presentation/widget/list_item/list_item.dart';
 import 'package:rasadyar_chicken/presentation/widget/list_row_item.dart';
 import 'package:rasadyar_core/core.dart';
@@ -75,7 +76,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.toSteward?.user?.fullname ?? 'N/A',
+                item.steward?.user?.fullname ?? 'N/A',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
@@ -90,6 +91,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
        Expanded(
          flex: 3,
          child: Column(
+            spacing: 3,
            mainAxisAlignment: MainAxisAlignment.center,
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
@@ -114,7 +116,11 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
                ],
              ),

-              SizedBox(height: 2),
+              Text(
+                item.steward?.guildsName ?? 'N/A',
+                textAlign: TextAlign.start,
+                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+              ),
            ],
          ),
        ),
@@ -197,7 +203,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
          ),

          buildRow(
-            title: 'نام و نام خانوادگی فروشنده',
+            title: 'مشخصات فروشنده',
            value: item.steward?.user?.fullname ?? 'N/A',
          ),
          buildRow(
@@ -205,7 +211,10 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
            value: item.steward?.user?.mobile ?? 'N/A',
            valueStyle: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
          ),
-
+          buildRow(
+            title: 'نوع تخصیص',
+            value: item.allocationType?.faAllocationType ?? 'N/A',
+          ),
          buildRow(title: 'محصول', value: item.product?.name ?? 'N/A'),
          buildRow(
            title: 'وزن خریداری شده',
--- a/packages/chicken/lib/presentation/pages/sales_in_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/sales_in_province/view.dart
@@ -145,7 +145,7 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
            spacing: 4,
            children: [
              Text(
-                item.steward?.user?.fullname ?? 'N/A',
+                controller.getBuyerInformation(item)?.user?.fullname ?? 'N/A',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
              ),
@@ -219,8 +219,10 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
          Row(
            mainAxisAlignment: MainAxisAlignment.start,
            children: [
+
+
              Text(
-                item.steward?.user?.fullname ?? 'N/A',
+                controller.getBuyerInformation(item)?.user?.fullname ?? 'N/A',
                textAlign: TextAlign.center,
                style: AppFonts.yekan16.copyWith(color: AppColor.greenDark),
              ),
@@ -284,18 +286,22 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
            ),
          ),

-          buildRow(
-            title: 'نام و نام خانوادگی فروشنده',
+     /*     buildRow(
+            title: 'مشخصات خریدار',
            value: controller.getBuyerInformation(item)?.user?.fullname ?? 'N/A',
-          ),
+          ),*/

          buildRow(
-            title: 'تلفن فروشنده',
+            title: 'تلفن خریدار',
            value: controller.getBuyerInformation(item)?.user?.mobile ?? 'N/A',
            valueStyle: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
          ),
          buildRow(title: 'نوع فروش', value: item.sellType?.faItem ?? 'N/A'),
          buildRow(title: 'محصول', value: item.product?.name ?? 'N/A'),
+          buildRow(
+            title: 'نوع تخصیص',
+            value: item.allocationType?.faAllocationType ?? 'N/A',
+          ),
          buildRow(
            title: 'وزن خریداری شده',
            value: '${item.weightOfCarcasses?.separatedByComma} کیلوگرم',
--- a/packages/chicken/lib/presentation/pages/sales_out_of_province/logic.dart
+++ b/packages/chicken/lib/presentation/pages/sales_out_of_province/logic.dart
@@ -66,6 +66,7 @@ class SalesOutOfProvinceLogic extends GetxController {
      (callback) => getOutProvinceSales(),
      time: Duration(milliseconds: timeDebounce),
    );
+    setupListeners();
  }

  void setSearchValue(String? value) {
--- a/packages/chicken/lib/presentation/pages/sales_out_of_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/sales_out_of_province/view.dart
@@ -188,7 +188,7 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
            mainAxisAlignment: MainAxisAlignment.start,
            children: [
              Text(
-                '${item.province}-${item.city}',
+                '${item.province} - ${item.city}',
                textAlign: TextAlign.center,
                style: AppFonts.yekan16.copyWith(color: AppColor.greenDark),
              ),
--- a/packages/chicken/lib/presentation/pages/segmentation/logic.dart
+++ b/packages/chicken/lib/presentation/pages/segmentation/logic.dart
@@ -144,7 +144,7 @@ class SegmentationLogic extends GetxController {

  Future<void> deleteSegmentation(String key) async {
    await safeCall(
-      showError: true,
+      showError: false,
      call: () => rootLogic.chickenRepository.deleteSegmentation(
        token: rootLogic.tokenService.accessToken.value!,
        key: key,