comee_core 0.1.80 → 0.1.81
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/comee/core/client_prices_controller.rb +16 -49
- data/app/models/comee/core/client_price.rb +1 -1
- data/app/models/comee/core/master_price.rb +1 -1
- data/app/serializers/comee/core/client_price_serializer.rb +1 -0
- data/app/serializers/comee/core/master_price_serializer.rb +1 -0
- data/lib/comee/core/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a4318ef428c28e4dbcf4fe933ec2b485b451988f05b512743d27eee5279cd86f
|
4
|
+
data.tar.gz: d2ac11b22312a1ec6255c96f2bdcffed7339d4e5d53a8b547e5c478de715c509
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c466754e9b38187b8e07699ba940397ca8186350b074abaf193a133da26a53692935cbd8ffff307ba0ef8923f7ffa79cac8508d16662d81b270792269fea2acf
|
7
|
+
data.tar.gz: 0e053593a318be96788240fa1ecbe6116759a3096414bdee15df9795e7e110c74f992b6df4cec3eb0493608b55910111ecdb369e8c7efa9bf18b2c1796e17023
|
@@ -10,57 +10,24 @@ module Comee
|
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
13
|
+
def fetch_for_client
|
14
|
+
client = Comee::Core::Client.find(params[:id])
|
15
|
+
client_id = client.parent_id || client.id
|
16
|
+
prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
|
17
|
+
.filter(client_id: client_id)
|
18
|
+
total = prices.count
|
19
|
+
prices = prices.then(&paginate)
|
20
|
+
|
21
|
+
render json: {success: true, data: serialize(prices), page: params[:page], total: total}
|
22
|
+
end
|
23
|
+
|
13
24
|
def filter
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
25
|
+
prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
|
26
|
+
.ransack(params[:q]).result
|
27
|
+
total = prices.count
|
28
|
+
prices = prices.then(&paginate)
|
18
29
|
|
19
|
-
|
20
|
-
conditions.or(Comee::Core::ProductLookup.where(condition))
|
21
|
-
end
|
22
|
-
result = @client_prices.each_with_object([]) do |obj, res|
|
23
|
-
item = {
|
24
|
-
id: obj.id,
|
25
|
-
valid_from: obj.valid_from,
|
26
|
-
valid_to: obj.valid_to,
|
27
|
-
price: obj.price,
|
28
|
-
status: obj.status,
|
29
|
-
margin: obj.margin,
|
30
|
-
margin_type: obj.margin_type,
|
31
|
-
client_id: obj.client.id,
|
32
|
-
client_code: obj.client.code,
|
33
|
-
client_name: obj.client.name,
|
34
|
-
client_address: obj.client.address,
|
35
|
-
product_id: obj.product.id,
|
36
|
-
product_code: obj.product.code,
|
37
|
-
product_name: obj.product.name,
|
38
|
-
product_description: obj.product.description,
|
39
|
-
product_preferred_units: obj.product.preferred_units,
|
40
|
-
product_weight: obj.product.weight,
|
41
|
-
product_weight_unit: obj.product.weight_unit,
|
42
|
-
product_dimensions: obj.product.dimensions,
|
43
|
-
product_hs_code: obj.product.hs_code,
|
44
|
-
product_hs_description: obj.product.hs_description,
|
45
|
-
product_image: obj.product.thumbnail_image_url,
|
46
|
-
unit_id: obj.unit.id,
|
47
|
-
unit_code: obj.unit.code,
|
48
|
-
unit_name: obj.unit.name
|
49
|
-
}
|
50
|
-
lkp = lookups.select { |lookup| lookup.itemable_id == obj.client_id && lookup.product_id == obj.product_id }
|
51
|
-
if lkp.count.positive?
|
52
|
-
item[:client_product_code] = lkp[0].code
|
53
|
-
item[:client_product_name] = lkp[0].item_description
|
54
|
-
end
|
55
|
-
res << item
|
56
|
-
end
|
57
|
-
result = {success: true, data: result}
|
58
|
-
page = params[:page]
|
59
|
-
if page
|
60
|
-
result[:page] = page
|
61
|
-
result[:total] = total
|
62
|
-
end
|
63
|
-
render json: result
|
30
|
+
render json: {success: true, data: serialize(prices), page: params[:page], total: total}
|
64
31
|
end
|
65
32
|
|
66
33
|
private
|
data/lib/comee/core/version.rb
CHANGED